djencks 2005/03/01 22:38:45
Modified: modules/openejb-builder/src/schema geronimo-config.xsd
Log:
openejb's copy was seriously out of date. This duplication is just plain evil
Revision Changes Path
1.2 +21 -5
openejb/modules/openejb-builder/src/schema/geronimo-config.xsd
Index: geronimo-config.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/geronimo-config.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geronimo-config.xsd 10 Jan 2005 19:12:43 -0000 1.1
+++ geronimo-config.xsd 2 Mar 2005 03:38:45 -0000 1.2
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<xs:schema
targetNamespace="http://geronimo.apache.org/xml/ns/deployment";
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment";
@@ -32,8 +32,6 @@
</xs:documentation>
</xs:annotation>
-<!-- <xs:include schemaLocation="geronimo-common.xsd"/>-->
-
<xs:element name="configuration" type="sys:configurationType"/>
<xs:complexType name="configurationType">
@@ -43,7 +41,16 @@
<xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="configId" type="xs:string" use="required"/>
- <xs:attribute name="parentId" type="xs:string" use="optional"/>
+ <xs:attribute name="parentId" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ You are required to specify either parentId or both domain
and server. domain and server form
+ the domain and J2EEServer key for gbeans in this
configuration and any descendant configurations.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional"/>
+ <xs:attribute name="server" type="xs:string" use="optional"/>
</xs:complexType>
<xs:element name="dependency" type="sys:dependencyType"/>
@@ -63,11 +70,13 @@
<xs:complexType name="gbeanType">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="attribute" type="sys:attributeType"/>
+ <xs:element name="xml-attribute" type="sys:xml-attributeType"/>
<xs:element name="reference" type="sys:referenceType"/>
<xs:element name="references" type="sys:referencesType"/>
</xs:choice>
<xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="namePart" type="xs:string"/>
+ <xs:attribute name="class" type="xs:string" use="required"/>
</xs:complexType>
<xs:complexType name="attributeType">
@@ -77,6 +86,13 @@
<xs:attribute name="type" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="xml-attributeType">
+ <xs:sequence>
+ <xs:any namespace="##other"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
</xs:complexType>
<xs:complexType name="referenceType">
