From 0d0f05368256058c9c2f66e4d9b2df45fdd70129 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Thu, 24 Feb 2011 02:26:57 +0100
Subject: [PATCH] Updated the XSD schema

---
 .../Resources/config/schema/doctrine-1.0.xsd  | 46 +++++--------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd b/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
index da8b103943..eed26fef53 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
@@ -33,27 +33,15 @@
     </xsd:attributeGroup>
 
     <xsd:complexType name="dbal">
-        <xsd:all>
-            <xsd:element name="connections" type="connections" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="types" type="types" minOccurs="0" maxOccurs="1" />
-        </xsd:all>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="connection" type="connection" />
+            <xsd:element name="type" type="type" />
+        </xsd:choice>
 
         <xsd:attribute name="default-connection" type="xsd:string" />
         <xsd:attributeGroup ref="connection-config" />
     </xsd:complexType>
 
-    <xsd:complexType name="connections">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="connection" type="connection" />
-        </xsd:choice>
-    </xsd:complexType>
-
-    <xsd:complexType name="types">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="type" type="type" />
-        </xsd:choice>
-    </xsd:complexType>
-
     <xsd:complexType name="type">
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="class" type="xsd:string" use="required" />
@@ -73,18 +61,12 @@
         <xsd:attribute name="is-bundle" type="xsd:boolean" />
     </xsd:complexType>
 
-    <xsd:complexType name="mappings">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="mapping" type="mapping" />
-        </xsd:choice>
-    </xsd:complexType>
-
     <xsd:complexType name="orm">
-        <xsd:all>
-            <xsd:element name="entity-managers" type="entity_managers" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="mappings" type="mappings" minOccurs="0" maxOccurs="1" />
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="entity-manager" type="entity_manager" />
+            <xsd:element name="mapping" type="mapping" />
             <xsd:element name="metadata-cache-driver" type="metadata_cache_driver" minOccurs="0" maxOccurs="1" />
-        </xsd:all>
+        </xsd:choice>
 
         <xsd:attribute name="default-entity-manager" type="xsd:string" />
         <xsd:attribute name="default-connection" type="xsd:string" />
@@ -106,17 +88,11 @@
         <xsd:attribute name="type" type="xsd:string" />
     </xsd:complexType>
 
-    <xsd:complexType name="entity_managers">
-        <xsd:choice minOccurs="1" maxOccurs="unbounded">
-            <xsd:element name="entity-manager" type="entity_manager" />
-        </xsd:choice>
-    </xsd:complexType>
-
     <xsd:complexType name="entity_manager">
-        <xsd:all>
-            <xsd:element name="mappings" type="mappings" minOccurs="0" maxOccurs="1" />
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="mapping" type="mapping" />
             <xsd:element name="metadata-cache-driver" type="metadata_cache_driver" minOccurs="0" maxOccurs="1" />
-        </xsd:all>
+        </xsd:choice>
 
         <xsd:attribute name="connection" type="xsd:string" />
         <xsd:attribute name="name" type="xsd:string" />