[jboss-cvs] JBossAS SVN: r65697 - in projects/security/security-jboss-sx/trunk: jbosssx-client and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 28 16:23:26 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-09-28 16:23:26 -0400 (Fri, 28 Sep 2007)
New Revision: 65697
Added:
projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/
projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd
Removed:
projects/security/security-jboss-sx/trunk/src/resources/dtd/
projects/security/security-jboss-sx/trunk/src/resources/schema/
projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd
projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd
Modified:
projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml
projects/security/security-jboss-sx/trunk/pom.xml
projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
Log:
version change to 2.0.1.beta2 and move dtd/schema to test/resources
Modified: projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml 2007-09-28 18:41:55 UTC (rev 65696)
+++ projects/security/security-jboss-sx/trunk/jbosssx-client/pom.xml 2007-09-28 20:23:26 UTC (rev 65697)
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>jboss</groupId>
<artifactId>jbosssx-client</artifactId>
- <version>2.0.1-BETA1</version>
+ <version>2.0.1-BETA2</version>
<packaging>jar</packaging>
<name>JBoss Security Client</name>
<url>http://www.jboss.org</url>
Modified: projects/security/security-jboss-sx/trunk/pom.xml
===================================================================
--- projects/security/security-jboss-sx/trunk/pom.xml 2007-09-28 18:41:55 UTC (rev 65696)
+++ projects/security/security-jboss-sx/trunk/pom.xml 2007-09-28 20:23:26 UTC (rev 65697)
@@ -8,7 +8,7 @@
<groupId>jboss</groupId>
<artifactId>jbosssx</artifactId>
<packaging>jar</packaging>
- <version>2.0.1-BETA1</version>
+ <version>2.0.1-BETA2</version>
<name>JBoss Security Implementation for the JBAS</name>
<url>http://labs.jboss.org/portal/jbosssecurity/</url>
<description>JBoss Security is a cross cutting project that handles security for the JEMS projects</description>
Modified: projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2007-09-28 18:41:55 UTC (rev 65696)
+++ projects/security/security-jboss-sx/trunk/src/main/org/jboss/security/mapping/providers/OptionsRoleMappingProvider.java 2007-09-28 20:23:26 UTC (rev 65697)
@@ -11,10 +11,9 @@
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Map;
-import java.util.Properties;
+import java.util.Properties;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityConstants;
import org.jboss.security.mapping.MappingProvider;
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/dtd (from rev 65642, projects/security/security-jboss-sx/trunk/src/resources/dtd)
Deleted: projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd
===================================================================
--- projects/security/security-jboss-sx/trunk/src/resources/dtd/security-policy.dtd 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!--Generated by XML Authority-->
-
-<!-- The root element of the security-policy document. A security policy document represents a
-union of the Java2 codebase+signers and JAAS subject+codebased+signers policy files. The
-org.jboss.security.SecurityPolicy class parses a security-policy document using the
-org.jboss.security.SecurityPolicyParser and implements both the java.security.Policy and
-javax.security.auth.Policy interfaces.
--->
-<!ELEMENT application-policy (keystore? , authentication? , authorization?)>
-
-<!ATTLIST application-policy name CDATA 'other' >
-<!-- A grant element grants the indicated permissions -->
-<!ELEMENT grant (principal* , permission+)>
-
-<!ATTLIST grant codebase CDATA #IMPLIED
- signedby CDATA #IMPLIED >
-<!-- A principal element represents a named principal. The code attribute is a class that implements
-the java.security.Principal interface. The name attribute corresponds to the Principal#getName()
-value.
--->
-<!ELEMENT principal EMPTY>
-
-<!ATTLIST principal code CDATA #REQUIRED
- name CDATA #REQUIRED >
-<!-- The permission element represents a java.security.Permission implementation. Its code
-attribute is the name of the class that implements the java.security.Permission interface.
--->
-<!ELEMENT permission EMPTY>
-
-<!ATTLIST permission code CDATA #REQUIRED
- actions CDATA #IMPLIED
- name CDATA #REQUIRED
- signedby CDATA #IMPLIED >
-<!-- The target element is the optional target-name of its parent permission element. It is the
-string that the java.security.Prinicpal#getName() method returns.
--->
-<!ELEMENT target (#PCDATA)>
-
-<!-- The actions element represents the optional actions of its parent permission element. It is the
-string that the java.security.Principal#getActions() method returns.
--->
-<!ELEMENT actions (#PCDATA)>
-
-<!ELEMENT keystore EMPTY>
-
-<!ATTLIST keystore href CDATA '.keystore'
- type CDATA 'JKS' >
-<!ELEMENT authentication (login-module+)>
-
-<!ELEMENT authorization (grant+)>
-
-<!ELEMENT login-module (module-option*)>
-
-<!ATTLIST login-module code CDATA #REQUIRED
- flag (required | requisite | sufficient | optional ) 'required' >
-<!ELEMENT module-option (#PCDATA)>
-
-<!ATTLIST module-option name CDATA #REQUIRED >
-<!ELEMENT policy (application-policy+)>
-
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd (from rev 65696, projects/security/security-jboss-sx/trunk/src/resources/dtd/security-policy.dtd)
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/dtd/security-policy.dtd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--Generated by XML Authority-->
+
+<!-- The root element of the security-policy document. A security policy document represents a
+union of the Java2 codebase+signers and JAAS subject+codebased+signers policy files. The
+org.jboss.security.SecurityPolicy class parses a security-policy document using the
+org.jboss.security.SecurityPolicyParser and implements both the java.security.Policy and
+javax.security.auth.Policy interfaces.
+-->
+<!ELEMENT application-policy (keystore? , authentication? , authorization?)>
+
+<!ATTLIST application-policy name CDATA 'other' >
+<!-- A grant element grants the indicated permissions -->
+<!ELEMENT grant (principal* , permission+)>
+
+<!ATTLIST grant codebase CDATA #IMPLIED
+ signedby CDATA #IMPLIED >
+<!-- A principal element represents a named principal. The code attribute is a class that implements
+the java.security.Principal interface. The name attribute corresponds to the Principal#getName()
+value.
+-->
+<!ELEMENT principal EMPTY>
+
+<!ATTLIST principal code CDATA #REQUIRED
+ name CDATA #REQUIRED >
+<!-- The permission element represents a java.security.Permission implementation. Its code
+attribute is the name of the class that implements the java.security.Permission interface.
+-->
+<!ELEMENT permission EMPTY>
+
+<!ATTLIST permission code CDATA #REQUIRED
+ actions CDATA #IMPLIED
+ name CDATA #REQUIRED
+ signedby CDATA #IMPLIED >
+<!-- The target element is the optional target-name of its parent permission element. It is the
+string that the java.security.Prinicpal#getName() method returns.
+-->
+<!ELEMENT target (#PCDATA)>
+
+<!-- The actions element represents the optional actions of its parent permission element. It is the
+string that the java.security.Principal#getActions() method returns.
+-->
+<!ELEMENT actions (#PCDATA)>
+
+<!ELEMENT keystore EMPTY>
+
+<!ATTLIST keystore href CDATA '.keystore'
+ type CDATA 'JKS' >
+<!ELEMENT authentication (login-module+)>
+
+<!ELEMENT authorization (grant+)>
+
+<!ELEMENT login-module (module-option*)>
+
+<!ATTLIST login-module code CDATA #REQUIRED
+ flag (required | requisite | sufficient | optional ) 'required' >
+<!ELEMENT module-option (#PCDATA)>
+
+<!ATTLIST module-option name CDATA #REQUIRED >
+<!ELEMENT policy (application-policy+)>
+
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/schema (from rev 65642, projects/security/security-jboss-sx/trunk/src/resources/schema)
Deleted: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd
===================================================================
--- projects/security/security-jboss-sx/trunk/src/resources/schema/security-config_4_1.xsd 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: security-config_4_1.xsd 45686 2006-06-20 04:47:48Z asaldhana $ -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- xmlns:jaas="urn:jboss:security-config:4.1"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
- targetNamespace="urn:jboss:security-config:4.1">
-
- <xsd:annotation>
- <xsd:documentation><![CDATA[
- The login-config.xml schema with jbossxb annotations that map conforming
- documents to the org.jboss.security.auth.login.PolicyConfig.
- $Id: security-config_4_1.xsd 45686 2006-06-20 04:47:48Z asaldhana $
- This is the XML Schema for the jboss 4.1 security configuration descriptor.
- The default version of the descriptor is found in conf/login-config.xml
- and this version of the schema is indicated using:
-
- <policy xmlns="urn:jboss:security-config:4.1"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="4.1">
- ...
- </policy>
-
- The outline of a policy/application-policy is:
- <policy>
- <application-policy name="security-domain-name">
- <authentication>
- <login-module code="login.module1.class.name" flag="control_flag">
- <module-option name = "option1-name">option1-value</module-option>
- <module-option name = "option2-name">option2-value</module-option>
- ...
- </login-module>
-
- <login-module code="login.module2.class.name" flag="control_flag">
- ...
- </login-module>
- ...
- </authentication>
- </application-policy>
- </policy>
- ]]></xsd:documentation>
- <xsd:appinfo>
- <jbxb:schemaBindings>
- <jbxb:package name="org.jboss.security.config"/>
- <jbxb:ignoreUnresolvedFieldOrClass>false</jbxb:ignoreUnresolvedFieldOrClass>
- </jbxb:schemaBindings>
- </xsd:appinfo>
- </xsd:annotation>
-
- <xsd:element name="policy">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:documentation>The policy element is the root of the security
- configuration descriptor.</xsd:documentation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" ref="jaas:application-policy"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="application-policy">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:documentation>The application-policy lists configuration for a
- named policy. This currently only consists of the authentication
- configuration. </xsd:documentation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.config.ApplicationPolicyContainer"/>
- <jbxb:addMethod name="add" valueType="org.jboss.security.config.ApplicationPolicy"/>
- </xsd:appinfo>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element ref="jaas:authentication"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="authentication">
- <xsd:annotation>
- <xsd:documentation>The authentication element contains the login module
- stack configuration. Each login module configuration is specified
- using a login-module element.</xsd:documentation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" ref="jaas:login-module"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="login-module">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:documentation>The login-module element defines a JAAS login module
- configuration entry. Each entry must have a code and flag attribute
- along with zero or more login module options specified via the
- module-option element. </xsd:documentation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded" ref="jaas:module-option"/>
- </xsd:sequence>
- <xsd:attribute name="code" use="required" type="xsd:string"/>
- <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:complexType>
- </xsd:element>
- <xsd:element name="module-option">
- <xsd:complexType mixed="true">
- <xsd:annotation>
- <xsd:documentation>A module option defines a name, value pair that are
- passed to a LoginModule when it is initialized during the login proceedure.
- The name attribute defines the option name while the element value is the
- option value. The type of the value can be anything from a string obtained
- from the module-option body, to arbitary objects unmarshalled based on
- the namespace associated with the module-option child element
- </xsd:documentation>
- <xsd:appinfo>
- <!-- ModuleOption declares a constructor that takes name as a parameter
- 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"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd (from rev 65696, projects/security/security-jboss-sx/trunk/src/resources/schema/security-config_4_1.xsd)
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_4_1.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: security-config_4_1.xsd 45686 2006-06-20 04:47:48Z asaldhana $ -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ xmlns:jaas="urn:jboss:security-config:4.1"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
+ targetNamespace="urn:jboss:security-config:4.1">
+
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ The login-config.xml schema with jbossxb annotations that map conforming
+ documents to the org.jboss.security.auth.login.PolicyConfig.
+ $Id: security-config_4_1.xsd 45686 2006-06-20 04:47:48Z asaldhana $
+ This is the XML Schema for the jboss 4.1 security configuration descriptor.
+ The default version of the descriptor is found in conf/login-config.xml
+ and this version of the schema is indicated using:
+
+ <policy xmlns="urn:jboss:security-config:4.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="4.1">
+ ...
+ </policy>
+
+ The outline of a policy/application-policy is:
+ <policy>
+ <application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+ </application-policy>
+ </policy>
+ ]]></xsd:documentation>
+ <xsd:appinfo>
+ <jbxb:schemaBindings>
+ <jbxb:package name="org.jboss.security.config"/>
+ <jbxb:ignoreUnresolvedFieldOrClass>false</jbxb:ignoreUnresolvedFieldOrClass>
+ </jbxb:schemaBindings>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:element name="policy">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>The policy element is the root of the security
+ configuration descriptor.</xsd:documentation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" ref="jaas:application-policy"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="application-policy">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>The application-policy lists configuration for a
+ named policy. This currently only consists of the authentication
+ configuration. </xsd:documentation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.config.ApplicationPolicyContainer"/>
+ <jbxb:addMethod name="add" valueType="org.jboss.security.config.ApplicationPolicy"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element ref="jaas:authentication"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="authentication">
+ <xsd:annotation>
+ <xsd:documentation>The authentication element contains the login module
+ stack configuration. Each login module configuration is specified
+ using a login-module element.</xsd:documentation>
+ <xsd:appinfo>
+ <jbxb:skip/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" ref="jaas:login-module"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="login-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>The login-module element defines a JAAS login module
+ configuration entry. Each entry must have a code and flag attribute
+ along with zero or more login module options specified via the
+ module-option element. </xsd:documentation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.auth.login.AppConfigurationEntryHolder"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element minOccurs="0" maxOccurs="unbounded" ref="jaas:module-option"/>
+ </xsd:sequence>
+ <xsd:attribute name="code" use="required" type="xsd:string"/>
+ <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:complexType>
+ </xsd:element>
+ <xsd:element name="module-option">
+ <xsd:complexType mixed="true">
+ <xsd:annotation>
+ <xsd:documentation>A module option defines a name, value pair that are
+ passed to a LoginModule when it is initialized during the login proceedure.
+ The name attribute defines the option name while the element value is the
+ option value. The type of the value can be anything from a string obtained
+ from the module-option body, to arbitary objects unmarshalled based on
+ the namespace associated with the module-option child element
+ </xsd:documentation>
+ <xsd:appinfo>
+ <!-- ModuleOption declares a constructor that takes name as a parameter
+ 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"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
Deleted: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd
===================================================================
--- projects/security/security-jboss-sx/trunk/src/resources/schema/security-config_5_0.xsd 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -1,271 +0,0 @@
-<!-- $Id: security-config_5_0.xsd 64432 2007-08-02 16:07:41Z anil.saldhana at jboss.com $ -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jbsx="urn:jboss:security-config:5.0"
- 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"
- attributeFormDefault="unqualified">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:schemaBindings>
- <jbxb:package name="org.jboss.security.config"/>
- <jbxb:ignoreUnresolvedFieldOrClass>
- false</jbxb:ignoreUnresolvedFieldOrClass>
- </jbxb:schemaBindings>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:element name="policy" type="jbsx:PolicyConfig"/>
- <xsd:complexType name="PolicyConfig">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:application-policy" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:element name="application-policy">
- <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>
- </xsd:annotation>
- <xsd:sequence>
- <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:element ref="jbsx:audit" minOccurs="0"/>
- <xsd:element ref="jbsx:identity-trust" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="authentication" type="jbsx:authenticationInfo"/>
- <xsd:element name="authentication-jaspi" type="jbsx:authenticationJaspiInfo"/>
- <xsd:element name="authorization" type="jbsx:authorizationInfo"/>
- <xsd:element name="rolemapping" type="jbsx:roleMappingInfo"/>
- <xsd:element name="audit" type="jbsx:auditInfo"/>
- <xsd:element name="identity-trust" type="jbsx:identityTrustInfo"/>
- <xsd:complexType name="authenticationInfo">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:login-module" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="authenticationJaspiInfo">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:login-module-stack" maxOccurs="unbounded"/>
- <xsd:element ref="jbsx:auth-module" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="authorizationInfo">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:policy-module"/>
- </xsd:sequence>
- </xsd:complexType>
- <xsd:complexType name="roleMappingInfo">
- <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: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:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:trust-module"/>
- </xsd:sequence>
- </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
- 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: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">
- <xsd:complexType mixed="true">
- <xsd:annotation>
- <xsd:appinfo>
- <!-- ModuleOption declares a constructor that takes name as a parameter
- 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"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:any namespace="##other" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </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>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element ref="jbsx:login-module" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="auth-module" type="jbsx:authModuleInfo"/>
- <xsd:complexType name="authModuleInfo">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.auth.container.config.AuthModuleEntryHolder"/>
- </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="login-module-stack-ref" type="xsd:string"/>
- </xsd:complexType>
- <xsd:element name="policy-module">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.authorization.config.AuthorizationConfigEntryHolder"/>
- </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>
- <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:element name="provider-module">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.audit.config.AuditConfigEntryHolder"/>
- </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:element name="trust-module">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:appinfo>
- <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" type="jbsx:module-option-flag" use="required"/>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd (from rev 65696, projects/security/security-jboss-sx/trunk/src/resources/schema/security-config_5_0.xsd)
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/security-config_5_0.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -0,0 +1,272 @@
+<!-- $Id: security-config_5_0.xsd 64432 2007-08-02 16:07:41Z anil.saldhana at jboss.com $ -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:jbsx="urn:jboss:security-config:5.0"
+ 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"
+ attributeFormDefault="unqualified">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:schemaBindings>
+ <jbxb:package name="org.jboss.security.config"/>
+ <jbxb:ignoreUnresolvedFieldOrClass>
+ false</jbxb:ignoreUnresolvedFieldOrClass>
+ </jbxb:schemaBindings>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:element name="policy" type="jbsx:PolicyConfig"/>
+ <xsd:complexType name="PolicyConfig">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:application-policy" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:element name="application-policy">
+ <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>
+ </xsd:annotation>
+ <xsd:sequence>
+ <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:element ref="jbsx:audit" minOccurs="0"/>
+ <xsd:element ref="jbsx:identity-trust" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="extends" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="authentication" type="jbsx:authenticationInfo"/>
+ <xsd:element name="authentication-jaspi" type="jbsx:authenticationJaspiInfo"/>
+ <xsd:element name="authorization" type="jbsx:authorizationInfo"/>
+ <xsd:element name="rolemapping" type="jbsx:roleMappingInfo"/>
+ <xsd:element name="audit" type="jbsx:auditInfo"/>
+ <xsd:element name="identity-trust" type="jbsx:identityTrustInfo"/>
+ <xsd:complexType name="authenticationInfo">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:skip/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:login-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="authenticationJaspiInfo">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:skip/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:login-module-stack" maxOccurs="unbounded"/>
+ <xsd:element ref="jbsx:auth-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="authorizationInfo">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:skip/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:policy-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="roleMappingInfo">
+ <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" maxOccurs="unbounded"/>
+ </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" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="identityTrustInfo">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:skip/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:trust-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </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
+ 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: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">
+ <xsd:complexType mixed="true">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <!-- ModuleOption declares a constructor that takes name as a parameter
+ 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"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:any namespace="##other" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </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>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:login-module" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="auth-module" type="jbsx:authModuleInfo"/>
+ <xsd:complexType name="authModuleInfo">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.auth.container.config.AuthModuleEntryHolder"/>
+ </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="login-module-stack-ref" type="xsd:string"/>
+ </xsd:complexType>
+ <xsd:element name="policy-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.authorization.config.AuthorizationConfigEntryHolder"/>
+ </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>
+ <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:element name="provider-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.audit.config.AuditConfigEntryHolder"/>
+ </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:element name="trust-module">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <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" type="jbsx:module-option-flag" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
Deleted: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd
===================================================================
--- projects/security/security-jboss-sx/trunk/src/resources/schema/user-roles_1_0.xsd 2007-09-27 04:51:49 UTC (rev 65642)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: user-roles_1_0.xsd 34316 2005-07-31 23:13:44Z starksm $ -->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="urn:jboss:user-roles"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
- xmlns:ur="urn:jboss:user-roles">
-
- <xsd:element name="users">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.auth.spi.Users"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="1" maxOccurs="unbounded" ref="ur:user"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="user">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.security.auth.spi.Users$User"/>
- <jbxb:addMethod name="addUser" valueType="child"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element minOccurs="0" maxOccurs="unbounded" ref="ur:role"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:NCName"/>
- <xsd:attribute name="password" use="required" type="xsd:NCName"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="role">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntry/>
- <jbxb:putMethod name="addRole"
- keyType="java.lang.String" valueType="java.lang.String" />
- </xsd:appinfo>
- </xsd:annotation>
-
- <xsd:complexType>
- <xsd:attribute name="group" use="optional" type="xsd:NCName" default="Roles">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntryValue/>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="name" use="required" type="xsd:NCName">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntryKey/>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
Copied: projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd (from rev 65696, projects/security/security-jboss-sx/trunk/src/resources/schema/user-roles_1_0.xsd)
===================================================================
--- projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd (rev 0)
+++ projects/security/security-jboss-sx/trunk/src/tests/resources/schema/user-roles_1_0.xsd 2007-09-28 20:23:26 UTC (rev 65697)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: user-roles_1_0.xsd 34316 2005-07-31 23:13:44Z starksm $ -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="urn:jboss:user-roles"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
+ xmlns:ur="urn:jboss:user-roles">
+
+ <xsd:element name="users">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.auth.spi.Users"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element minOccurs="1" maxOccurs="unbounded" ref="ur:user"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="user">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.security.auth.spi.Users$User"/>
+ <jbxb:addMethod name="addUser" valueType="child"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element minOccurs="0" maxOccurs="unbounded" ref="ur:role"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:NCName"/>
+ <xsd:attribute name="password" use="required" type="xsd:NCName"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="role">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry/>
+ <jbxb:putMethod name="addRole"
+ keyType="java.lang.String" valueType="java.lang.String" />
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:complexType>
+ <xsd:attribute name="group" use="optional" type="xsd:NCName" default="Roles">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntryValue/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="name" use="required" type="xsd:NCName">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntryKey/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
More information about the jboss-cvs-commits
mailing list