Author: tchemit Date: 2010-11-28 00:26:43 +0100 (Sun, 28 Nov 2010) New Revision: 1005 Url: http://nuiton.org/repositories/revision/eugene/1005 Log: Evolution #1110: Expose dtd and xsd of objectmodel on site Evolution #1111: Update objectmodel xsd Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl Modified: trunk/eugene/src/main/resources/xsd/objectmodel.xsd =================================================================== --- trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/resources/xsd/objectmodel.xsd 2010-11-27 23:26:43 UTC (rev 1005) @@ -35,6 +35,7 @@ <xsd:element name="enumeration" type="enumeration"/> </xsd:choice> <xsd:attribute name="name" type="xsd:string" use="required"/> + <xsd:attribute name="version" type="xsd:string" use="optional"/> </xsd:complexType> <xsd:complexType name="classifier"> @@ -48,6 +49,7 @@ </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="package" type="xsd:string" use="required"/> + <xsd:attribute name="extern" type="xsd:boolean" use="optional"/> </xsd:complexType> <xsd:complexType name="class"> @@ -94,6 +96,7 @@ <xsd:attribute name="maxMultiplicity" type="xsd:integer" use="optional"/> <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:complexType> <xsd:complexType name="operation"> @@ -101,6 +104,7 @@ <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"/> + <xsd:element name="tagValue" type="tagValue" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="visibility" type="xsd:string" use="optional"/> Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2010-11-27 23:26:43 UTC (rev 1005) @@ -25,13 +25,15 @@ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt" xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns="http://nuiton.org/eugene/objectModel/v1" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" - xmlns:UML="org.omg.xmi.namespace.UML" xmlns:UML2="org.omg.xmi.namespace.UML2"> + xmlns:UML="org.omg.xmi.namespace.UML" + xmlns:UML2="org.omg.xmi.namespace.UML2"> <xsl:output method="xml" encoding="UTF-8" @@ -53,12 +55,13 @@ <xsl:template match="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement"> <xsl:element name="objectModel"> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="../@name"/> </xsl:attribute> <!-- ajout de l'attribut version disponible dans les taggedValue --> - <xsl:attribute name="version"> + <xsl:attribute name="version" xsi:nill=""> <xsl:variable name="versionTagId"> <xsl:value-of select="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:TagDefinition[@name='version']/@xmi.id"/> </xsl:variable> Modified: trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-27 22:09:33 UTC (rev 1004) +++ trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2010-11-27 23:26:43 UTC (rev 1005) @@ -25,11 +25,13 @@ --> <xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xslt" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:xalan="http://xml.apache.org/xslt" xmlns:extensions="http://www.codelutin.com/XSLTExtensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" extension-element-prefixes="extensions redirect" - xmlns="http://www.codelutin.org/eugene/objectModel" + xmlns="http://nuiton.org/eugene/objectModel/v1" xmlns:packageValidator="xalan://org.nuiton.eugene.PackageValidator" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML"> @@ -49,6 +51,7 @@ <xsl:template match="uml:Model"> <xsl:element name="objectModel"> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="@name" /> </xsl:attribute>