← Back to team overview

mlhim-specs-dev team mailing list archive

  1. mlhim-specs-dev team
  2. Mailing list archive
  3. Message #00475

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 239: Corrected attribute name conflicts, preparing for 2.3.0 B2 release. Generated new schemas.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 239
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sun 2012-04-22 16:52:37 -0500
message:
  Corrected attribute name conflicts, preparing for 2.3.0 B2 release. Generated new schemas.
modified:
  mlhim2-emf/org.mlhim2/model/mlhim2.ecore
  mlhim2-emf/org.mlhim2/model/mlhim2.genmodel
  schemas/mlhim2.content.xsd
  schemas/mlhim2.datatypes.xsd


--
lp:mlhim-specs
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main

Your team MLHIM Specifications Developers is subscribed to branch lp:mlhim-specs.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/main/+edit-subscription

=== modified file 'mlhim2-emf/org.mlhim2/model/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/model/mlhim2.ecore	2012-04-22 17:59:16 +0000
+++ mlhim2-emf/org.mlhim2/model/mlhim2.ecore	2012-04-22 21:52:37 +0000
@@ -10,7 +10,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//DateTime"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//datatypes/DvAny">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="bool_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_trues" upperBound="-1"
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_falses" upperBound="-1"
@@ -18,7 +18,7 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvURI" eSuperTypes="#//datatypes/DvString"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvString" eSuperTypes="#//datatypes/DvAny">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="string_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Language"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumeration" upperBound="-1"
@@ -53,7 +53,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Language"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//datatypes/DvEncapsulated">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="parsable_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="formalism" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvMedia" abstract="true" eSuperTypes="#//datatypes/DvEncapsulated">
@@ -63,7 +63,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="hash_function" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="alt_txt" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Base64Binary"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="media_content" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Base64Binary"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//datatypes/DvAny">
       <eStructuralFeatures xsi:type="ecore:EReference" name="normal_range" eType="#//datatypes/ReferenceRange"/>
@@ -72,7 +72,8 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="normal_status" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvOrdinal" eSuperTypes="#//datatypes/DvOrdered">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordinal_dv" lowerBound="1"
+          eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Int"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" lowerBound="1"
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
     </eClassifiers>
@@ -115,18 +116,16 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="data_range" eType="#//datatypes/DvInterval"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvTemporal">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvTemporal"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvTemporal"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvTemporal"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvTemporal" eSuperTypes="#//datatypes/DvOrdered">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal_dv" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//String"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="allow_partial" lowerBound="1"
           eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/XMLType.ecore#//Boolean"
           defaultValueLiteral="true"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDuration" eSuperTypes="#//datatypes/DvTemporal"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDateTime" eSuperTypes="#//datatypes/DvTemporal"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvTemporal"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvTemporal"/>
   </eSubpackages>
   <eSubpackages name="demographic" nsURI="http://www.mlhim.org/mlhim2/demographic";
       nsPrefix="mlhim2">

=== modified file 'mlhim2-emf/org.mlhim2/model/mlhim2.genmodel'
--- mlhim2-emf/org.mlhim2/model/mlhim2.genmodel	2012-04-18 02:03:14 +0000
+++ mlhim2-emf/org.mlhim2/model/mlhim2.genmodel	2012-04-22 21:52:37 +0000
@@ -33,13 +33,13 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvAny/valid_time_end"/>
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvBoolean">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvBoolean/dv"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvBoolean/bool_dv"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvBoolean/valid_trues"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvBoolean/valid_falses"/>
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvURI"/>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvString">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvString/dv"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvString/string_dv"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvString/language"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvString/uuid"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvString/enumeration"/>
@@ -64,16 +64,13 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvIdentifier/issuer"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvIdentifier/assignor"/>
       </genClasses>
-      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvParagraph">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvParagraph/items"/>
-      </genClasses>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//datatypes/DvEncapsulated">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvEncapsulated/size"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvEncapsulated/charset"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvEncapsulated/language"/>
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvParsable">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvParsable/dv"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvParsable/parsable_dv"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvParsable/formalism"/>
       </genClasses>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//datatypes/DvMedia">
@@ -83,6 +80,7 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvMedia/hash_function"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvMedia/alt_txt"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvMedia/uri"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvMedia/media_content"/>
       </genClasses>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//datatypes/DvOrdered">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
@@ -92,7 +90,7 @@
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvOrdered/normal_status"/>
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvOrdinal">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvOrdinal/dv"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvOrdinal/ordinal_dv"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvOrdinal/symbol"/>
       </genClasses>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//datatypes/DvQuantified">
@@ -135,13 +133,12 @@
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mlhim2.ecore#//datatypes/ReferenceRange/data_range"/>
       </genClasses>
-      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvDuration">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvDuration/dv"/>
-      </genClasses>
-      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvDateTime">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvDateTime/dv"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvDateTime/allow_partial"/>
-      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvTemporal">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvTemporal/temporal_dv"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//datatypes/DvTemporal/allow_partial"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvDuration"/>
+      <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvDateTime"/>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvDate"/>
       <genClasses ecoreClass="mlhim2.ecore#//datatypes/DvTime"/>
     </nestedGenPackages>
@@ -421,6 +418,8 @@
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//content/CareEntry">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//content/CareEntry/guideline_id"/>
+        <genFeatures notify="false" createChild="false" propertySortChoices="true"
+            ecoreFeature="ecore:EReference mlhim2.ecore#//content/CareEntry/data"/>
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//content/AdminEntry">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"

=== modified file 'schemas/mlhim2.content.xsd'
--- schemas/mlhim2.content.xsd	2012-04-18 02:03:14 +0000
+++ schemas/mlhim2.content.xsd	2012-04-22 21:52:37 +0000
@@ -33,6 +33,7 @@
     <xsd:complexContent>
       <xsd:extension base="mlhim2:Entry">
         <xsd:attribute ecore:name="guideline_id" name="guideline_id" type="xsd:string"/>
+        <xsd:attribute ecore:reference="mlhim2_3:Item" name="data" type="xsd:anyURI" use="required"/>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>

=== modified file 'schemas/mlhim2.datatypes.xsd'
--- schemas/mlhim2.datatypes.xsd	2012-04-18 02:03:14 +0000
+++ schemas/mlhim2.datatypes.xsd	2012-04-22 21:52:37 +0000
@@ -9,7 +9,6 @@
   <xsd:element ecore:ignore="true" name="DvToken" type="mlhim2:DvToken"/>
   <xsd:element ecore:ignore="true" name="DvCodedString" type="mlhim2:DvCodedString"/>
   <xsd:element ecore:ignore="true" name="DvIdentifier" type="mlhim2:DvIdentifier"/>
-  <xsd:element ecore:ignore="true" name="DvParagraph" type="mlhim2:DvParagraph"/>
   <xsd:element ecore:ignore="true" name="DvEncapsulated" type="mlhim2:DvEncapsulated"/>
   <xsd:element ecore:ignore="true" name="DvParsable" type="mlhim2:DvParsable"/>
   <xsd:element ecore:ignore="true" name="DvMedia" type="mlhim2:DvMedia"/>
@@ -23,6 +22,7 @@
   <xsd:element ecore:ignore="true" name="DvProportion" type="mlhim2:DvProportion"/>
   <xsd:element ecore:ignore="true" name="DvInterval" type="mlhim2:DvInterval"/>
   <xsd:element ecore:ignore="true" name="ReferenceRange" type="mlhim2:ReferenceRange"/>
+  <xsd:element ecore:ignore="true" name="DvTemporal" type="mlhim2:DvTemporal"/>
   <xsd:element ecore:ignore="true" name="DvDuration" type="mlhim2:DvDuration"/>
   <xsd:element ecore:ignore="true" name="DvDateTime" type="mlhim2:DvDateTime"/>
   <xsd:element ecore:ignore="true" name="DvDate" type="mlhim2:DvDate"/>
@@ -43,7 +43,7 @@
           <xsd:element ecore:name="valid_trues" ecore:unique="true" maxOccurs="unbounded" minOccurs="0" name="valid_trues" nillable="true" type="xsd:string"/>
           <xsd:element ecore:name="valid_falses" ecore:unique="true" maxOccurs="unbounded" minOccurs="0" name="valid_falses" nillable="true" type="xsd:string"/>
         </xsd:sequence>
-        <xsd:attribute name="dv" type="xsd:string"/>
+        <xsd:attribute ecore:name="bool_dv" name="bool_dv" type="xsd:string"/>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
@@ -58,7 +58,7 @@
         <xsd:sequence>
           <xsd:element default="" ecore:unique="true" maxOccurs="unbounded" minOccurs="0" name="enumeration" nillable="true" type="xsd:string"/>
         </xsd:sequence>
-        <xsd:attribute name="dv" type="xsd:string"/>
+        <xsd:attribute ecore:name="string_dv" name="string_dv" type="xsd:string"/>
         <xsd:attribute name="language" type="xsd:language"/>
         <xsd:attribute name="uuid" type="xsd:string"/>
         <xsd:attribute name="pattern" type="xsd:string"/>
@@ -106,13 +106,6 @@
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
-  <xsd:complexType name="DvParagraph">
-    <xsd:complexContent>
-      <xsd:extension base="mlhim2:DvAny">
-        <xsd:attribute name="items" type="xsd:NMTOKENS"/>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
   <xsd:complexType abstract="true" name="DvEncapsulated">
     <xsd:complexContent>
       <xsd:extension base="mlhim2:DvAny">
@@ -125,7 +118,7 @@
   <xsd:complexType name="DvParsable">
     <xsd:complexContent>
       <xsd:extension base="mlhim2:DvEncapsulated">
-        <xsd:attribute name="dv" type="xsd:string"/>
+        <xsd:attribute ecore:name="parsable_dv" name="parsable_dv" type="xsd:string"/>
         <xsd:attribute name="formalism" type="xsd:string"/>
       </xsd:extension>
     </xsd:complexContent>
@@ -139,6 +132,7 @@
         <xsd:attribute ecore:name="hash_function" name="hash_function" type="xsd:string"/>
         <xsd:attribute ecore:name="alt_txt" name="alt_txt" type="xsd:string"/>
         <xsd:attribute name="uri" type="xsd:string"/>
+        <xsd:attribute ecore:name="media_content" name="media_content" type="xsd:base64Binary"/>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
@@ -158,7 +152,7 @@
   <xsd:complexType name="DvOrdinal">
     <xsd:complexContent>
       <xsd:extension base="mlhim2:DvOrdered">
-        <xsd:attribute ecore:unsettable="false" name="dv" type="xsd:int" use="required"/>
+        <xsd:attribute ecore:name="ordinal_dv" ecore:unsettable="false" name="ordinal_dv" type="xsd:int" use="required"/>
         <xsd:attribute name="symbol" type="xsd:string" use="required"/>
       </xsd:extension>
     </xsd:complexContent>
@@ -231,29 +225,32 @@
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
+  <xsd:complexType name="DvTemporal">
+    <xsd:complexContent>
+      <xsd:extension base="mlhim2:DvOrdered">
+        <xsd:attribute ecore:name="temporal_dv" name="temporal_dv" type="xsd:string"/>
+        <xsd:attribute ecore:default="true" ecore:name="allow_partial" ecore:unsettable="false" name="allow_partial" type="xsd:boolean" use="required"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
   <xsd:complexType name="DvDuration">
     <xsd:complexContent>
-      <xsd:extension base="mlhim2:DvOrdered">
-        <xsd:attribute name="dv" type="xsd:duration"/>
-      </xsd:extension>
+      <xsd:extension base="mlhim2:DvTemporal"/>
     </xsd:complexContent>
   </xsd:complexType>
   <xsd:complexType name="DvDateTime">
     <xsd:complexContent>
-      <xsd:extension base="mlhim2:DvOrdered">
-        <xsd:attribute name="dv" type="xsd:dateTime"/>
-        <xsd:attribute ecore:default="true" ecore:name="allow_partial" ecore:unsettable="false" name="allow_partial" type="xsd:boolean" use="required"/>
-      </xsd:extension>
+      <xsd:extension base="mlhim2:DvTemporal"/>
     </xsd:complexContent>
   </xsd:complexType>
   <xsd:complexType name="DvDate">
     <xsd:complexContent>
-      <xsd:extension base="mlhim2:DvDateTime"/>
+      <xsd:extension base="mlhim2:DvTemporal"/>
     </xsd:complexContent>
   </xsd:complexType>
   <xsd:complexType name="DvTime">
     <xsd:complexContent>
-      <xsd:extension base="mlhim2:DvDateTime"/>
+      <xsd:extension base="mlhim2:DvTemporal"/>
     </xsd:complexContent>
   </xsd:complexType>
 </xsd:schema>
  Thread Previous • Date Previous • • Thread Next