[jboss-cvs] JBossAS SVN: r64411 - in trunk: iiop and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 1 16:36:19 EDT 2007
Author: anil.saldhana at jboss.com
Date: 2007-08-01 16:36:19 -0400 (Wed, 01 Aug 2007)
New Revision: 64411
Modified:
trunk/console/build.xml
trunk/iiop/.classpath
trunk/iiop/build.xml
trunk/jbossmq/.classpath
trunk/jbossmq/build.xml
trunk/messaging/.classpath
trunk/security/.classpath
trunk/security/build.xml
trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java
trunk/server/.classpath
trunk/server/build.xml
trunk/server/src/resources/schema/security-config_5_0.xsd
Log:
move security towards 2.0.1-BETA
Modified: trunk/console/build.xml
===================================================================
--- trunk/console/build.xml 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/console/build.xml 2007-08-01 20:36:19 UTC (rev 64411)
@@ -95,7 +95,7 @@
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.management.classpath"/>
- <path refid="jboss.security.classpath"/>
+ <path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.mq.classpath"/>
<path refid="jboss.system.classpath"/>
Modified: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/iiop/.classpath 2007-08-01 20:36:19 UTC (rev 64411)
@@ -7,20 +7,20 @@
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="src" path="/naming"/>
+ <classpathentry kind="src" path="/security"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="src" path="/system"/>
<classpathentry kind="src" path="/transaction"/>
<classpathentry kind="src" path="/j2se"/>
<classpathentry kind="lib" path="/thirdparty/apache-avalon/lib/avalon-framework.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
- <classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-integration.jar" sourcepath="/thirdparty/jboss/integration/lib/jboss-integration-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/iiop/build.xml
===================================================================
--- trunk/iiop/build.xml 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/iiop/build.xml 2007-08-01 20:36:19 UTC (rev 64411)
@@ -100,8 +100,8 @@
<path refid="jboss.naming.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.security.classpath"/>
- <path refid="jboss.security.spi.classpath"/>
+ <path refid="jboss.jbosssx.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.transaction.classpath"/>
</path>
Modified: trunk/jbossmq/.classpath
===================================================================
--- trunk/jbossmq/.classpath 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/jbossmq/.classpath 2007-08-01 20:36:19 UTC (rev 64411)
@@ -11,10 +11,11 @@
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="src" path="/j2se"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-integration.jar" sourcepath="/thirdparty/jboss/integration/lib/integration-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" sourcepath="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/jbossmq/build.xml
===================================================================
--- trunk/jbossmq/build.xml 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/jbossmq/build.xml 2007-08-01 20:36:19 UTC (rev 64411)
@@ -87,8 +87,9 @@
<path refid="jboss.naming.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.j2se.classpath"/>
- <path refid="jboss.security.classpath"/>
- <path refid="jboss.security.spi.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
+ <path refid="jboss.jbosssx.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
</path>
<!-- ===== -->
Modified: trunk/messaging/.classpath
===================================================================
--- trunk/messaging/.classpath 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/messaging/.classpath 2007-08-01 20:36:19 UTC (rev 64411)
@@ -6,12 +6,11 @@
<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
+ <classpathentry kind="src" path="/security"/>
<classpathentry kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="src" path="/j2se"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry kind="lib" path="/thirdparty/jboss/messaging/lib/jboss-messaging.jar" sourcepath="/home/svn/JBossMessaging/JBossMessaging_1_0_1_GA/src/main"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
Modified: trunk/security/.classpath
===================================================================
--- trunk/security/.classpath 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/security/.classpath 2007-08-01 20:36:19 UTC (rev 64411)
@@ -2,11 +2,10 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/tests"/>
- <classpathentry kind="lib" path="output/lib/jbosssx-server.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx-client.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/security-spi/lib/jboss-security-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" />
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" sourcepath="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/javassist/lib/javassist.jar" sourcepath="/thirdparty/javassist/lib/javassist-src.jar"/>
Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/security/build.xml 2007-08-01 20:36:19 UTC (rev 64411)
@@ -92,11 +92,12 @@
<path refid="jboss.common.logging.jdk.classpath"/>
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.security.spi.classpath"/>
- <path refid="jboss.security.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
+ <path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
</path>
Modified: trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java
===================================================================
--- trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/security/src/main/org/jboss/security/plugins/JaasSecurityManager.java 2007-08-01 20:36:19 UTC (rev 64411)
@@ -34,6 +34,7 @@
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
+import javax.security.auth.message.MessageInfo;
import org.jboss.logging.Logger;
import org.jboss.security.AuthorizationManager;
@@ -354,6 +355,11 @@
log.trace("End isValid, "+isValid);
return isValid;
}
+
+ public boolean isValid(MessageInfo requestMessage, Subject clientSubject, String layer)
+ {
+ return false;
+ }
/** Map the argument principal from the deployment environment principal
to the developer environment. This is called by the EJB context
Modified: trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java
===================================================================
--- trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/security/src/main/org/jboss/security/propertyeditor/SecurityDomainEditor.java 2007-08-01 20:36:19 UTC (rev 64411)
@@ -31,6 +31,7 @@
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.TrustManagerFactory;
import javax.security.auth.Subject;
+import javax.security.auth.message.MessageInfo;
import org.jboss.security.SecurityDomain;
import org.jboss.logging.Logger;
@@ -167,6 +168,12 @@
initDelegate();
return delegate.isValid(principal, credential, activeSubject);
}
+
+ public boolean isValid(MessageInfo messageInfo, Subject activeSubject, String layer)
+ {
+ initDelegate();
+ return delegate.isValid(messageInfo, activeSubject, layer);
+ }
public Subject getActiveSubject()
{
Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/server/.classpath 2007-08-01 20:36:19 UTC (rev 64411)
@@ -24,8 +24,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/ejb3-persistence.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security/lib/jbosssx.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/security-spi/lib/jboss-security-spi-sources.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
<classpathentry combineaccessrules="false" kind="src" path="/transaction"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar"/>
@@ -44,5 +42,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-integration.jar" sourcepath="/thirdparty/jboss/integration/lib/jboss-integration-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/security/lib/jbosssx-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/server/build.xml 2007-08-01 20:36:19 UTC (rev 64411)
@@ -103,6 +103,7 @@
<path id="dependentmodule.classpath">
<!--path refid="ejb3-persistence.classpath"/-->
<path refid="jboss.jboss.javaee.classpath"/>
+ <path refid="jboss.jboss.jaspi.api.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
@@ -112,8 +113,8 @@
<path refid="jboss.j2se.classpath"/>
<path refid="jboss.mbeans.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.security.spi.classpath"/>
- <path refid="jboss.security.classpath"/>
+ <path refid="jboss.jboss.security.spi.classpath"/>
+ <path refid="jboss.jbosssx.classpath"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.transaction.classpath"/>
</path>
Modified: trunk/server/src/resources/schema/security-config_5_0.xsd
===================================================================
--- trunk/server/src/resources/schema/security-config_5_0.xsd 2007-08-01 20:32:01 UTC (rev 64410)
+++ trunk/server/src/resources/schema/security-config_5_0.xsd 2007-08-01 20:36:19 UTC (rev 64411)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- $Id$ -->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- 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: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"
+ targetNamespace="urn:jboss:security-config:5.0"
+ elementFormDefault="qualified">
+
+ <xsd:annotation>
<xsd:appinfo>
<jbxb:schemaBindings>
<jbxb:package name="org.jboss.security.config"/>
@@ -14,188 +15,251 @@
</jbxb:schemaBindings>
</xsd:appinfo>
</xsd:annotation>
- <xsd:element name="policy">
- <xsd:complexType>
+
+
+ <xsd:element name="policy" type="jbsx:PolicyConfig"/>
+ <xsd:complexType name="PolicyConfig">
+
<xsd:annotation>
<xsd:appinfo>
- <jbxb:class impl="org.jboss.security.config.PolicyConfig"/>
+ <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>
- <xsd:element name="application-policy">
- <xsd:complexType>
- <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.config.ApplicationPolicyContainer"/>
- <jbxb:addMethod name="add" valueType="org.jboss.security.config.ApplicationPolicy"/>
+ <jbxb:class impl="org.jboss.security.mapping.config.RoleMappingConfigContainer"/>
+ <jbxb:addMethod name="addMappingInfo"/>
</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:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="authentication">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="jbsx:login-module"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="login-module">
- <xsd:complexType>
- <xsd:annotation>
+ <xsd:sequence>
+ <xsd:element ref="jbsx:mapping-module"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="auditInfo">
+ <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: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" use="required">
- <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:appinfo>
- <!-- ModuleOption declares a constructor that takes name as a parameter
- while the value should be set with the setter.
+ <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: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 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="authentication-jaspi">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <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 name="login-module-stack">
- <xsd:complexType>
- <xsd:annotation>
+ 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.login.LoginModuleStackContainer"/>
+ <jbxb:class
+ impl="org.jboss.security.auth.container.config.AuthModuleEntryHolder"/>
</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">
- <xsd:complexType>
- <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>
- <xsd:element name="authorization">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:skip/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element ref="jbsx:policy-module"/>
- </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"/>
- </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: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="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: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" use="required">
+ <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="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.trust.config.TrustConfigEntryHolder"/>
+ </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