Menu
▾
▴
nhibernate-commit
|
From: Paul H. <pha...@us...> - 2005-03-26 12:15:12
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25631/nhibernate/src/NHibernate Modified Files: nhibernate-mapping-2.0.xsd Log Message: Put common attributes into attribute groups, general tidy up Index: nhibernate-mapping-2.0.xsd =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/nhibernate-mapping-2.0.xsd,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** nhibernate-mapping-2.0.xsd 18 Mar 2005 23:32:18 -0000 1.9 --- nhibernate-mapping-2.0.xsd 26 Mar 2005 12:15:01 -0000 1.10 *************** *** 46,49 **** --- 46,78 ---- </xs:restriction> </xs:simpleType> + <xs:attributeGroup name="baseClassAttributes"> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="proxy" type="xs:string" use="optional"> + <xs:annotation> + <xs:documentation>default: no proxy interface </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="dynamic-update" type="xs:boolean" use="optional" default="false"/> + <xs:attribute name="dynamic-insert" type="xs:boolean" use="optional" default="false"/> + </xs:attributeGroup> + <xs:attributeGroup name="baseAssociationAttributes"> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="access" type="propertyAccess" use="optional"/> + <xs:attribute name="table" type="xs:string" use="optional"/> + <xs:attribute name="schema" type="xs:string" use="optional"/> + <xs:attribute name="lazy" type="xs:boolean" use="optional" default="false"/> + <xs:attribute name="cascade" type="cascadeStyle" use="optional"/> + <xs:attribute name="where" type="xs:string" use="optional"/> + <xs:attribute name="inverse" type="xs:boolean" use="optional" default="false"/> + </xs:attributeGroup> + <xs:simpleType name="unsavedValueType"> + <xs:annotation> + <xs:documentation>Values used to restrict composite-id, does not apply to meta/column/generator</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:string"> + <xs:enumeration value="any"/> + <xs:enumeration value="none"/> + </xs:restriction> + </xs:simpleType> <xs:element name="hibernate-mapping"> <xs:annotation> *************** *** 75,78 **** --- 104,109 ---- </xs:attribute> <xs:attribute name="auto-import" type="xs:boolean" use="optional" default="true"/> + <xs:attribute name="namespace" type="xs:string" use="optional"/> + <xs:attribute name="assembly" type="xs:string" use="optional"/> </xs:complexType> </xs:element> *************** *** 122,156 **** </xs:choice> </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="table" type="xs:string"> <xs:annotation> <xs:documentation>default: unqualified classname </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="schema" type="xs:string"> <xs:annotation> <xs:documentation>default: no value </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="proxy" type="xs:string"> ! <xs:annotation> ! <xs:documentation>default: no proxy interface </xs:documentation> ! </xs:annotation> ! </xs:attribute> ! <xs:attribute name="discriminator-value" type="xs:string"> <xs:annotation> <xs:documentation>default: unqualified class name | none </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="mutable" type="xs:boolean" default="true"/> ! <xs:attribute name="polymorphism" type="polymorphismType" default="implicit"/> ! <xs:attribute name="where" type="xs:string"> <xs:annotation> <xs:documentation>default: none </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="persister" type="xs:string"/> - <xs:attribute name="dynamic-update" type="xs:boolean" default="false"/> - <xs:attribute name="dynamic-insert" type="xs:boolean" default="false"/> </xs:complexType> </xs:element> --- 153,180 ---- </xs:choice> </xs:sequence> ! <xs:attributeGroup ref="baseClassAttributes"/> ! <xs:attribute name="table" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>default: unqualified classname </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="schema" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>default: no value </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="discriminator-value" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>default: unqualified class name | none </xs:documentation> </xs:annotation> </xs:attribute> ! <xs:attribute name="mutable" type="xs:boolean" use="optional" default="true"/> ! <xs:attribute name="polymorphism" type="polymorphismType" use="optional" default="implicit"/> ! <xs:attribute name="persister" type="xs:string" use="optional"/> ! <xs:attribute name="where" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>default: none </xs:documentation> </xs:annotation> </xs:attribute> </xs:complexType> </xs:element> *************** *** 191,202 **** <xs:attribute name="name" type="xs:string"/> <xs:attribute name="access" type="propertyAccess"/> ! <xs:attribute name="unsaved-value" default="none"> ! <xs:simpleType> ! <xs:restriction base="xs:string"> ! <xs:enumeration value="any"/> ! <xs:enumeration value="none"/> ! </xs:restriction> ! </xs:simpleType> ! </xs:attribute> </xs:complexType> </xs:element> --- 215,219 ---- <xs:attribute name="name" type="xs:string"/> <xs:attribute name="access" type="propertyAccess"/> ! <xs:attribute name="unsaved-value" type="unsavedValueType" default="none"/> </xs:complexType> </xs:element> *************** *** 264,273 **** <xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="proxy" type="xs:string" use="optional"> ! <xs:annotation> ! <xs:documentation>default: no proxy interface </xs:documentation> ! </xs:annotation> ! </xs:attribute> <xs:attribute name="discriminator-value" type="xs:string" use="optional"> <xs:annotation> --- 281,286 ---- <xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attributeGroup ref="baseClassAttributes"/> ! <xs:attribute name="extends" type="xs:string" use="optional"/> <xs:attribute name="discriminator-value" type="xs:string" use="optional"> <xs:annotation> *************** *** 275,281 **** </xs:annotation> </xs:attribute> - <xs:attribute name="dynamic-update" type="xs:boolean" use="optional" default="false"/> - <xs:attribute name="dynamic-insert" type="xs:boolean" use="optional" default="false"/> - <xs:attribute name="extends" type="xs:string" use="optional"/> </xs:complexType> </xs:element> --- 288,291 ---- *************** *** 304,322 **** <xs:element ref="joined-subclass" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="proxy" type="xs:string"> ! <xs:annotation> ! <xs:documentation>default: no proxy interface </xs:documentation> ! </xs:annotation> ! </xs:attribute> ! <xs:attribute name="table" type="xs:string"> <xs:annotation> <xs:documentation>default: unqualified classname </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="schema" type="xs:string"/> - <xs:attribute name="dynamic-update" type="xs:boolean" default="false"/> - <xs:attribute name="dynamic-insert" type="xs:boolean" default="false"/> - <xs:attribute name="extends" type="xs:string" use="optional"/> </xs:complexType> </xs:element> --- 314,325 ---- <xs:element ref="joined-subclass" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> ! <xs:attributeGroup ref="baseClassAttributes"/> ! <xs:attribute name="extends" type="xs:string" use="optional"/> ! <xs:attribute name="schema" type="xs:string" use="optional"/> ! <xs:attribute name="table" type="xs:string" use="optional"> <xs:annotation> <xs:documentation>default: unqualified classname </xs:documentation> </xs:annotation> </xs:attribute> </xs:complexType> </xs:element> *************** *** 396,424 **** </xs:complexType> </xs:element> - <xs:element name="bag"> - <xs:complexType> - <xs:sequence> - <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="jcs-cache" minOccurs="0"/> - <xs:element ref="key"/> - <xs:choice> - <xs:element ref="element"/> - <xs:element ref="one-to-many"/> - <xs:element ref="many-to-many"/> - <xs:element ref="composite-element"/> - <xs:element ref="many-to-any"/> - </xs:choice> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="access" type="propertyAccess"/> - <xs:attribute name="table" type="xs:string"/> - <xs:attribute name="schema" type="xs:string"/> - <xs:attribute name="lazy" type="xs:boolean" default="false"/> - <xs:attribute name="inverse" type="xs:boolean" default="false"/> - <xs:attribute name="cascade" type="cascadeStyle"/> - <xs:attribute name="order-by" type="xs:string"/> - <xs:attribute name="where" type="xs:string"/> - </xs:complexType> - </xs:element> <xs:element name="collection-id"> <xs:complexType> --- 399,402 ---- *************** *** 609,637 **** </xs:complexType> </xs:element> - <xs:element name="list"> - <xs:complexType> - <xs:sequence> - <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="jcs-cache" minOccurs="0"/> - <xs:element ref="key"/> - <xs:element ref="index"/> - <xs:choice> - <xs:element ref="element"/> - <xs:element ref="one-to-many"/> - <xs:element ref="many-to-many"/> - <xs:element ref="composite-element"/> - <xs:element ref="many-to-any"/> - </xs:choice> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="access" type="propertyAccess"/> - <xs:attribute name="table" type="xs:string"/> - <xs:attribute name="schema" type="xs:string"/> - <xs:attribute name="lazy" type="xs:boolean" default="false"/> - <xs:attribute name="inverse" type="xs:boolean" default="false"/> - <xs:attribute name="cascade" type="cascadeStyle"/> - <xs:attribute name="where" type="xs:string"/> - </xs:complexType> - </xs:element> <xs:element name="many-to-any"> <xs:complexType> --- 587,590 ---- *************** *** 672,707 **** </xs:complexType> </xs:element> - <xs:element name="map"> - <xs:complexType> - <xs:sequence> - <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> - <xs:element ref="jcs-cache" minOccurs="0"/> - <xs:element ref="key"/> - <xs:choice> - <xs:element ref="index"/> - <xs:element ref="composite-index"/> - <xs:element ref="index-many-to-many"/> - <xs:element ref="index-many-to-any"/> - </xs:choice> - <xs:choice> - <xs:element ref="element"/> - <xs:element ref="one-to-many"/> - <xs:element ref="many-to-many"/> - <xs:element ref="composite-element"/> - <xs:element ref="many-to-any"/> - </xs:choice> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="access" type="propertyAccess"/> - <xs:attribute name="table" type="xs:string"/> - <xs:attribute name="schema" type="xs:string"/> - <xs:attribute name="lazy" type="xs:boolean" default="false"/> - <xs:attribute name="inverse" type="xs:boolean" default="false"/> - <xs:attribute name="sort" type="xs:string" default="unsorted"/> - <xs:attribute name="cascade" type="cascadeStyle"/> - <xs:attribute name="order-by" type="xs:string"/> - <xs:attribute name="where" type="xs:string"/> - </xs:complexType> - </xs:element> <xs:element name="meta"> <xs:complexType mixed="true"> --- 625,628 ---- *************** *** 774,777 **** --- 695,734 ---- </xs:complexType> </xs:element> + <xs:element name="list"> + <xs:complexType> + <xs:sequence> + <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="jcs-cache" minOccurs="0"/> + <xs:element ref="key"/> + <xs:element ref="index"/> + <xs:choice> + <xs:element ref="element"/> + <xs:element ref="one-to-many"/> + <xs:element ref="many-to-many"/> + <xs:element ref="composite-element"/> + <xs:element ref="many-to-any"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="baseAssociationAttributes"/> + </xs:complexType> + </xs:element> + <xs:element name="bag"> + <xs:complexType> + <xs:sequence> + <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="jcs-cache" minOccurs="0"/> + <xs:element ref="key"/> + <xs:choice> + <xs:element ref="element"/> + <xs:element ref="one-to-many"/> + <xs:element ref="many-to-many"/> + <xs:element ref="composite-element"/> + <xs:element ref="many-to-any"/> + </xs:choice> + </xs:sequence> + <xs:attributeGroup ref="baseAssociationAttributes"/> + <xs:attribute name="order-by" type="xs:string"/> + </xs:complexType> + </xs:element> <xs:element name="set"> <xs:complexType> *************** *** 788,801 **** </xs:choice> </xs:sequence> ! <xs:attribute name="name" type="xs:string" use="required"/> ! <xs:attribute name="access" type="propertyAccess"/> ! <xs:attribute name="table" type="xs:string"/> ! <xs:attribute name="schema" type="xs:string"/> ! <xs:attribute name="lazy" type="xs:boolean" default="false"/> <xs:attribute name="sort" type="xs:string" default="unsorted"/> ! <xs:attribute name="inverse" type="xs:boolean" default="false"/> ! <xs:attribute name="cascade" type="cascadeStyle"/> <xs:attribute name="order-by" type="xs:string"/> ! <xs:attribute name="where" type="xs:string"/> </xs:complexType> </xs:element> --- 745,776 ---- </xs:choice> </xs:sequence> ! <xs:attributeGroup ref="baseAssociationAttributes"/> ! <xs:attribute name="order-by" type="xs:string"/> <xs:attribute name="sort" type="xs:string" default="unsorted"/> ! </xs:complexType> ! </xs:element> ! <xs:element name="map"> ! <xs:complexType> ! <xs:sequence> ! <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded"/> ! <xs:element ref="jcs-cache" minOccurs="0"/> ! <xs:element ref="key"/> ! <xs:choice> ! <xs:element ref="index"/> ! <xs:element ref="composite-index"/> ! <xs:element ref="index-many-to-many"/> ! <xs:element ref="index-many-to-any"/> ! </xs:choice> ! <xs:choice> ! <xs:element ref="element"/> ! <xs:element ref="one-to-many"/> ! <xs:element ref="many-to-many"/> ! <xs:element ref="composite-element"/> ! <xs:element ref="many-to-any"/> ! </xs:choice> ! </xs:sequence> ! <xs:attributeGroup ref="baseAssociationAttributes"/> <xs:attribute name="order-by" type="xs:string"/> ! <xs:attribute name="sort" type="xs:string" default="unsorted"/> </xs:complexType> </xs:element> |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X