adc 2004/01/18 13:15:09
Modified: modules/core/src/schema geronimo-common.xsd
geronimo-ejb-jar.xsd
Log:
Additional deployment information
Revision Changes Path
1.6 +22 -1
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geronimo-common.xsd 18 Nov 2003 04:45:09 -0000 1.5
+++ geronimo-common.xsd 18 Jan 2004 21:15:09 -0000 1.6
@@ -20,12 +20,33 @@
<xsd:complexType name="securityType">
<xsd:annotation>
- <xsd:documentation>Security entries.</xsd:documentation>
+ <xsd:documentation>
+ Security entries
+
+ If this element is present, all web and EJB modules MUST
make the
+ appropriate access checks as outlined in the JACC spec.
+ </xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="default-principal"
type="default-principalType"/>
<xsd:element name="role-mappings" type="role-mappingsType"
minOccurs="0"/>
</xsd:sequence>
+ <xsd:attribute name="use-context-handler" type="xs:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+ Set this attribute to "true" if the installed JACC policy
+ contexts willuse PolicyContextHandlers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ <xsd:complexType name="default-principalType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="principal" type="principalType"/>
+ </xsd:sequence>
+ <xsd:attribute name="realm-name" type="xs:string"/>
</xsd:complexType>
<xsd:complexType name="role-mappingsType">
<xsd:sequence>
1.15 +9 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geronimo-ejb-jar.xsd 19 Nov 2003 11:07:57 -0000 1.14
+++ geronimo-ejb-jar.xsd 18 Jan 2004 21:15:09 -0000 1.15
@@ -238,6 +238,7 @@
<xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
<xsd:element name="security-role-ref"
type="j2ee:security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="security-identity"
type="j2ee:security-identityType" minOccurs="0"/>
+ <xsd:element name="bean-security" type="j2ee:bean-securityType"
minOccurs="0"/>
<xsd:element name="query" type="j2ee:queryType" minOccurs="0"
maxOccurs="unbounded"/>
<xsd:element name="update" type="j2ee:queryType" minOccurs="0"
maxOccurs="unbounded"/>
<xsd:element name="call" type="j2ee:queryType" minOccurs="0"
maxOccurs="unbounded"/>
@@ -270,6 +271,7 @@
<xsd:element name="activation-config"
type="activation-configType" minOccurs="0"/>
<xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
<xsd:element name="security-identity"
type="j2ee:security-identityType" minOccurs="0"/>
+ <xsd:element name="bean-security" type="j2ee:bean-securityType"
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -413,6 +415,12 @@
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
+ <xsd:complexType name="bean-securityType">
+ <xsd:sequence>
+ <xsd:element name="description" type="j2ee:descriptionType"
minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="use-identity" type="xs:boolean"/>
+ </xsd:complexType>
<xsd:complexType name="session-beanType">
<xsd:sequence>
<xsd:group ref="j2ee:descriptionGroup"/>
@@ -428,6 +436,7 @@
<xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
<xsd:element name="security-role-ref"
type="j2ee:security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="security-identity"
type="j2ee:security-identityType" minOccurs="0"/>
+ <xsd:element name="bean-security" type="j2ee:bean-securityType"
minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
