adc 2003/11/17 20:16:55
Modified: modules/core/src/schema geronimo-common.xsd
geronimo-ejb-jar.xsd geronimo-web-app.xsd
Log:
Principal/Role mappings added.
Revision Changes Path
1.4 +36 -0
incubator-geronimo/modules/core/src/schema/geronimo-common.xsd
Index: geronimo-common.xsd
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/schema/geronimo-common.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geronimo-common.xsd 17 Nov 2003 02:03:16 -0000 1.3
+++ geronimo-common.xsd 18 Nov 2003 04:16:55 -0000 1.4
@@ -17,4 +17,40 @@
<xsd:attribute name="name" type="xs:string"/>
<xsd:attribute name="parent" type="xs:string"/>
</xsd:complexType>
+
+ <xsd:complexType name="securityType">
+ <xsd:annotation>
+ <xsd:documentation>Security entries.</xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="role-mappings" type="role-mappingsType"
minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="role-mappingsType">
+ <xsd:sequence>
+ <xsd:element name="role" type="roleType" minOccurs="1"
maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="roleType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="realm" type="realmType" minOccurs="1"
maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="role-name" type="xs:string"/>
+ </xsd:complexType>
+ <xsd:complexType name="realmType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="principal" type="principalType" minOccurs="1"
maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="ream-name" type="xs:string"/>
+ </xsd:complexType>
+ <xsd:complexType name="principalType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="class" type="xs:string"/>
+ <xsd:attribute name="name" type="xs:string"/>
+ </xsd:complexType>
</xsd:schema>
1.9 +1 -0
incubator-geronimo/modules/core/src/schema/geronimo-ejb-jar.xsd
Index: geronimo-ejb-jar.xsd
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/schema/geronimo-ejb-jar.xsd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- geronimo-ejb-jar.xsd 17 Nov 2003 17:29:09 -0000 1.8
+++ geronimo-ejb-jar.xsd 18 Nov 2003 04:16:55 -0000 1.9
@@ -90,6 +90,7 @@
<xsd:complexType name="ejb-jarType">
<xsd:sequence>
<xsd:element name="class-space" type="ger:class-spaceType"/>
+ <xsd:element name="security" type="ger:securityType"/>
<xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="module-name" type="j2ee:string"
minOccurs="0"/>
<xsd:element name="datasource-name" type="j2ee:string"/>
1.2 +1 -0
incubator-geronimo/modules/core/src/schema/geronimo-web-app.xsd
Index: geronimo-web-app.xsd
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/schema/geronimo-web-app.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geronimo-web-app.xsd 8 Sep 2003 06:06:57 -0000 1.1
+++ geronimo-web-app.xsd 18 Nov 2003 04:16:55 -0000 1.2
@@ -1132,6 +1132,7 @@
<xsd:complexType name="web-appType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="security" type="ger:securityType"/>
<xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="distributable"
type="j2ee:emptyType"/>
