SF.net SVN: orm:[1373] trunk

[<mcu...@us...>]

Revision: 1373
          http://orm.svn.sourceforge.net/orm/?rev=1373&view=rev
Author:   mcurland
Date:     2009-03-25 17:17:23 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
Relaxed a couple of schema definitions. RoleInstance definition order was too strict, and custom properties would not reload without a property in a group. refs #374

Modified Paths:
--------------
    trunk/CustomProperties/CustomProperties.xsd
    trunk/ORMModel/ObjectModel/ORM2Core.xsd

Modified: trunk/CustomProperties/CustomProperties.xsd
===================================================================
--- trunk/CustomProperties/CustomProperties.xsd	2009-03-20 23:38:59 UTC (rev 1372)
+++ trunk/CustomProperties/CustomProperties.xsd	2009-03-25 17:17:23 UTC (rev 1373)
@@ -31,7 +31,7 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element ref="cp:CustomPropertyGroup" maxOccurs="unbounded" minOccurs="1"/>
+				<xs:element ref="cp:CustomPropertyGroup" maxOccurs="unbounded" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 		<xs:key name="CustomPropertyGroupKey">
@@ -49,10 +49,10 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PropertyDefinitions">
+				<xs:element name="PropertyDefinitions" minOccurs="0">
 					<xs:complexType>
 						<xs:sequence>
-							<xs:element ref="cp:Definition" maxOccurs="unbounded" minOccurs="1"/>
+							<xs:element ref="cp:Definition" maxOccurs="unbounded" minOccurs="0"/>
 						</xs:sequence>
 					</xs:complexType>
 				</xs:element>
@@ -164,7 +164,7 @@
 		</xs:annotation>
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element ref="cp:ORMType" maxOccurs="unbounded" minOccurs="1"/>
+				<xs:element ref="cp:ORMType" maxOccurs="unbounded" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 		<xs:unique name="ORMTypeUniquessConstraint">

Modified: trunk/ORMModel/ObjectModel/ORM2Core.xsd
===================================================================
--- trunk/ORMModel/ObjectModel/ORM2Core.xsd	2009-03-20 23:38:59 UTC (rev 1372)
+++ trunk/ORMModel/ObjectModel/ORM2Core.xsd	2009-03-25 17:17:23 UTC (rev 1373)
@@ -236,12 +236,12 @@
 	<xs:complexType name="ValueTypeInstanceRef">
 		<xs:attribute name="ref" type="xs:IDREF" use="required"/>
 	</xs:complexType>
-	<xs:complexType name="ObjectTypeRoleInstances">
-		<xs:sequence>
-			<xs:element name="EntityTypeRoleInstance" type="RoleInstance" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="ValueTypeRoleInstance" type="RoleInstance" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="FactTypeRoleInstance" type="RoleInstance" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
+	<xs:complexType name="RoleInstanceDefinitions">
+		<xs:choice minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="EntityTypeRoleInstance" type="RoleInstance"/>
+			<xs:element name="ValueTypeRoleInstance" type="RoleInstance"/>
+			<xs:element name="FactTypeRoleInstance" type="RoleInstance"/>
+		</xs:choice>
 	</xs:complexType>
 	<xs:complexType name="RoleInstance">
 		<xs:simpleContent>
@@ -589,7 +589,7 @@
 		<xs:sequence>
 			<xs:element name="RolePlayer" type="ObjectRef" minOccurs="0"/>
 			<xs:element name="ValueRestriction" type="RoleValueRestriction" minOccurs="0"/>
-			<xs:element name="RoleInstances" type="ObjectTypeRoleInstances" minOccurs="0"/>
+			<xs:element name="RoleInstances" type="RoleInstanceDefinitions" minOccurs="0"/>
 		</xs:sequence>
 		<xs:attribute name="Name" type="xs:string" use="required"/>
 		<xs:attribute name="id" type="xs:ID" use="required"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.