adc 2003/11/18 22:37:01
Modified: modules/core/src/schema geronimo-ejb-jar.xsd
geronimo-web-app.xsd
Log:
Security elements should be optional.
Revision Changes Path
1.12 +1 -1
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- geronimo-ejb-jar.xsd 19 Nov 2003 00:33:59 -0000 1.11
+++ geronimo-ejb-jar.xsd 19 Nov 2003 06:37:01 -0000 1.12
@@ -92,7 +92,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:element name="security" type="ger:securityType"
minOccurs="0"/>
<xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="module-name" type="j2ee:string"
minOccurs="0"/>
<xsd:element name="datasource-name" type="j2ee:string"/>
1.3 +1 -1
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geronimo-web-app.xsd 18 Nov 2003 04:16:55 -0000 1.2
+++ geronimo-web-app.xsd 19 Nov 2003 06:37:01 -0000 1.3
@@ -1132,7 +1132,6 @@
<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"/>
@@ -1149,6 +1148,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
+ <xsd:element name="security" type="ger:securityType" minOccurs="0"/>
<xsd:element name="filter"
type="j2ee:filterType"/>
