Author: tchemit Date: 2010-11-28 01:28:56 +0100 (Sun, 28 Nov 2010) New Revision: 1008 Url: http://nuiton.org/repositories/revision/eugene/1008 Log: Evolution #1111: Update objectmodel xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd =================================================================== --- trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-28 00:28:37 UTC (rev 1007) +++ trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-28 00:28:56 UTC (rev 1008) @@ -58,13 +58,21 @@ <xsd:sequence> <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> + <xsd:attribute name="extern" type="xsd:boolean" use="optional"/> + <xsd:attribute name="abstract" type="xsd:boolean" use="optional"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> <xsd:complexType name="associationClass"> <xsd:complexContent> - <xsd:extension base="classifier"/> + <xsd:extension base="classifier"> + <xsd:sequence> + <xsd:element name="attribute" type="attribute" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="participant" type="participant" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="abstract" type="xsd:boolean" use="optional"/> + </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -76,6 +84,7 @@ <xsd:complexType name="superclass"> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="discriminator" type="xsd:string" use="optional"/> </xsd:complexType> <xsd:complexType name="superinterface"> @@ -85,6 +94,7 @@ <xsd:complexType name="attribute"> <xsd:sequence> <xsd:element name="tagValue" type="tagValue" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="stereotype" type="stereotype" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="optional"/> <xsd:attribute name="visibility" type="xsd:string" use="optional"/> @@ -97,10 +107,13 @@ <xsd:attribute name="navigable" type="xsd:boolean" use="optional"/> <xsd:attribute name="ordering" type="xsd:string" use="optional"/> <xsd:attribute name="defaultValue" type="xsd:string" use="optional"/> + <xsd:attribute name="associationClassName" type="xsd:string" use="optional"/> + </xsd:complexType> <xsd:complexType name="operation"> <xsd:sequence> + <xsd:element name="stereotype" type="stereotype" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="returnParameter" type="returnParameter" minOccurs="1" maxOccurs="1"/> <xsd:element name="exceptionParameter" type="exceptionParameter" minOccurs="0" maxOccurs="unbounded"/> @@ -124,6 +137,11 @@ <xsd:attribute name="type" type="xsd:string" use="required"/> </xsd:complexType> + <xsd:complexType name="participant"> + <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="attribute" type="xsd:string" use="required"/> + </xsd:complexType> + <xsd:complexType name="enumeration"> <xsd:complexContent> <xsd:extension base="classifier">