← Back to team overview

mlhim-owners team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/mlhim-emf] Rev 40: Had to change the upperbound on several attributes back to 1 from unbounded. Need to discover ho...

 

------------------------------------------------------------
revno: 40
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-emf
timestamp: Thu 2011-03-24 18:26:14 -0500
message:
  Had to change the upperbound on several attributes back to 1 from unbounded.  Need to discover how to do this correctly.
modified:
  org.mlhim.rm/META-INF/MANIFEST.MF
  org.mlhim.rm/model/mlhim2.ecore
  org.mlhim.rm/model/mlhim2.genmodel


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

Your team Multi-level Healthcare Information Modelling Owners is subscribed to branch lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf/+edit-subscription
=== modified file 'org.mlhim.rm/META-INF/MANIFEST.MF'
--- org.mlhim.rm/META-INF/MANIFEST.MF	2011-03-04 17:37:42 +0000
+++ org.mlhim.rm/META-INF/MANIFEST.MF	2011-03-24 23:26:14 +0000
@@ -1,33 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.mlhim.rm;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: mlhim2.Common,
- mlhim2.Common.impl,
- mlhim2.Common.util,
- mlhim2.Constraint,
- mlhim2.Constraint.impl,
- mlhim2.Constraint.util,
- mlhim2.Content,
- mlhim2.Content.impl,
- mlhim2.Content.util,
- mlhim2.Datatypes,
- mlhim2.Datatypes.impl,
- mlhim2.Datatypes.util,
- mlhim2.Entity,
- mlhim2.Entity.impl,
- mlhim2.Entity.util,
- mlhim2.Structures,
- mlhim2.Structures.impl,
- mlhim2.Structures.util,
- mlhim2.Support,
- mlhim2.Support.impl,
- mlhim2.Support.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
-Bundle-ActivationPolicy: lazy
+Bundle-Name: org.mlhim.rm
+Bundle-SymbolicName: org.mlhim.rm
+Bundle-Version: 0.1.0
+Require-Bundle: org.eclipse.emf.ecore

=== modified file 'org.mlhim.rm/model/mlhim2.ecore'
--- org.mlhim.rm/model/mlhim2.ecore	2011-03-14 18:00:13 +0000
+++ org.mlhim.rm/model/mlhim2.ecore	2011-03-24 23:26:14 +0000
@@ -162,8 +162,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//Datatypes/DvAny">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
-          eType="#//Datatypes/DvText"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="items" eType="#//Datatypes/DvText"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//Datatypes/DvText">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="issuer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -202,7 +201,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="normal_status" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="normal_range" eType="#//Datatypes/DvInterval"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="other_reference_ranges"
-          upperBound="-1" eType="#//Datatypes/ReferenceRange"/>
+          eType="#//Datatypes/ReferenceRange"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="ReferenceRange">
       <eStructuralFeatures xsi:type="ecore:EReference" name="definition" eType="#//Datatypes/DvText"/>
@@ -246,7 +245,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="DvProportion" eSuperTypes="#//Datatypes/DvRatio">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportion_type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="DvAny" instanceTypeName="DvAny" abstract="true">
+    <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//Support/ExceptionalValue"/>
@@ -289,16 +288,14 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="feeder_audit" eType="#//Common/FeederAudit"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Folder" eSuperTypes="#//Common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
-          eType="#//Content/Composition"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="items" eType="#//Content/Composition"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="PartyProxy" abstract="true">
       <eStructuralFeatures xsi:type="ecore:EReference" name="external_ref" eType="#//Support/EntityRef"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="PartyIdentified" eSuperTypes="#//Common/PartyProxy">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" upperBound="-1"
-          eType="#//Datatypes/DvIdentifier"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" eType="#//Datatypes/DvIdentifier"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="PartyRelated" eSuperTypes="#//Common/PartyIdentified">
       <eStructuralFeatures xsi:type="ecore:EReference" name="relationship" eType="#//Entity/Relationship"/>
@@ -320,11 +317,10 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="originating_system_audit"
           eType="#//Common/FeederAuditDetails"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="originating_system_item_ids"
-          upperBound="-1" eType="#//Datatypes/DvIdentifier"/>
+          eType="#//Datatypes/DvIdentifier"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="feeder_system_audit"
           eType="#//Common/FeederAuditDetails"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="feeder_system_ids" upperBound="-1"
-          eType="#//Datatypes/DvIdentifier"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="feeder_system_ids" eType="#//Datatypes/DvIdentifier"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="original_content" eType="#//Datatypes/DvEncapsulated"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="FeederAuditDetails">
@@ -346,12 +342,9 @@
     <eClassifiers xsi:type="ecore:EClass" name="Party" abstract="true" eSuperTypes="#//Common/Locatable">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" upperBound="-1"
-          eType="#//Datatypes/DvIdentifier"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="roles" upperBound="-1"
-          eType="#//Entity/Role"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="locations" upperBound="-1"
-          eType="#//Entity/Location"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" eType="#//Datatypes/DvIdentifier"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="roles" eType="#//Entity/Role"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="locations" eType="#//Entity/Location"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//Common/Locatable">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -364,8 +357,7 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="details" eType="#//Structures/ItemStructure"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Relationship" eSuperTypes="#//Common/Locatable">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="targets" upperBound="-1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="targets" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//Entity/Party">
       <eStructuralFeatures xsi:type="ecore:EReference" name="members" eType="#//Entity/Party"/>
@@ -373,8 +365,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//Entity/Party">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="dob_accurate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="dob" eType="#//Datatypes/DvDateTime"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" upperBound="-1"
-          eType="#//Entity/Relationship"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" eType="#//Entity/Relationship"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//Entity/Party">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="domain" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -394,13 +385,13 @@
     </eClassifiers>
   </eSubpackages>
   <eSubpackages name="Constraint" nsURI="http://www.mlhim.org/rm/constraint"; nsPrefix="rm.constraint">
-    <eClassifiers xsi:type="ecore:EClass" name="CCD" instanceTypeName="CCD">
+    <eClassifiers xsi:type="ecore:EClass" name="CCD">
       <eStructuralFeatures xsi:type="ecore:EReference" name="definition" lowerBound="1"
           eType="#//Common/Locatable" transient="true"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="ontology" lowerBound="1"
           eType="#//Constraint/Ontology"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="metadata" unique="false"
-          lowerBound="1" upperBound="-1" eType="#//Constraint/MetaData" containment="true"/>
+          lowerBound="1" eType="#//Constraint/MetaData" containment="true"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Ontology">
       <eOperations name="ev_definitions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";>
@@ -414,8 +405,7 @@
         <eParameters name="keystr" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       </eOperations>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="MetaData" instanceTypeName="MetaData"
-        abstract="true">
+    <eClassifiers xsi:type="ecore:EClass" name="MetaData" abstract="true">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="metadata_version" lowerBound="1"
           eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString";
           defaultValueLiteral="2.0"/>
@@ -436,8 +426,7 @@
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="replaces" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="rightsHolder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" upperBound="-1"
-          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="subject" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="caDSR" eSuperTypes="#//Constraint/MetaData">

=== modified file 'org.mlhim.rm/model/mlhim2.genmodel'
--- org.mlhim.rm/model/mlhim2.genmodel	2011-03-04 17:18:50 +0000
+++ org.mlhim.rm/model/mlhim2.genmodel	2011-03-24 23:26:14 +0000
@@ -7,12 +7,6 @@
   <foreignModel>mlhim2.ecore</foreignModel>
   <genPackages prefix="Mlhim2" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#/">
     <nestedGenPackages prefix="Support" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Support">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Support.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Support.html"/>
-      </genAnnotations>
       <genClasses ecoreClass="mlhim2.ecore#//Support/ObjectRef">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ObjectRef/uuid"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ObjectRef/namespace"/>
@@ -20,32 +14,71 @@
       </genClasses>
       <genClasses ecoreClass="mlhim2.ecore#//Support/EntityRef"/>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Support/ExceptionalValue">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ExceptionalValue/name"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ExceptionalValue/meaning"/>
-      </genClasses>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/NI"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/INV"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/MSK"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/NA"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/UNK"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/DER"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/OTH"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/UNC"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/NINF"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/PINF"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/ASKU"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/TRC"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/QS"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/NASK"/>
-      <genClasses ecoreClass="mlhim2.ecore#//Support/NAV"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ExceptionalValue/ev_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ExceptionalValue/ev_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/NI">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NI/ni_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NI/ni_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/INV">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/INV/inv_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/INV/inv_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/MSK">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/MSK/msk_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/MSK/msk_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/NA">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NA/na_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NA/na_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/UNK">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/UNK/unk_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/UNK/unk_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/DER">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/DER/der_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/DER/der_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/OTH">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/OTH/oth_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/OTH/oth_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/UNC">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/UNC/unc_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/UNC/unc_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/NINF">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NINF/ninf_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NINF/ninf_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/PINF">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/PINF/pinf_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/PINF/pinf_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/ASKU">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ASKU/asku_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/ASKU/asku_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/TRC">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/TRC/trc_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/TRC/trc_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/QS">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/QS/qs_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/QS/qs_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/NASK">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NASK/nask_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NASK/nask_meaning"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Support/NAV">
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NAV/nav_name"/>
+        <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Support/NAV/nav_meaning"/>
+      </genClasses>
     </nestedGenPackages>
     <nestedGenPackages prefix="Datatypes" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Datatypes">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Datatypes.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Datatypes.html"/>
-      </genAnnotations>
       <genClasses ecoreClass="mlhim2.ecore#//Datatypes/DvURI">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Datatypes/DvURI/dv"/>
       </genClasses>
@@ -159,12 +192,6 @@
       </genClasses>
     </nestedGenPackages>
     <nestedGenPackages prefix="Structures" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Structures">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Structures.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Structures.html"/>
-      </genAnnotations>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Structures/DataStructure"/>
       <genClasses ecoreClass="mlhim2.ecore#//Structures/History"/>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Structures/ItemStructure"/>
@@ -181,12 +208,6 @@
       <genClasses ecoreClass="mlhim2.ecore#//Structures/IntervalEvent"/>
     </nestedGenPackages>
     <nestedGenPackages prefix="Content" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Content">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Content.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Content.html"/>
-      </genAnnotations>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Content/ContentItem"/>
       <genClasses ecoreClass="mlhim2.ecore#//Content/Composition"/>
       <genClasses ecoreClass="mlhim2.ecore#//Content/EventContext"/>
@@ -200,12 +221,6 @@
       <genClasses ecoreClass="mlhim2.ecore#//Content/Action"/>
     </nestedGenPackages>
     <nestedGenPackages prefix="Common" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Common">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Common.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Common.html"/>
-      </genAnnotations>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Common/Locatable">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/Locatable/parent"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/Locatable/uuid"/>
@@ -281,33 +296,8 @@
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mlhim2.ecore#//Common/Participation/time"/>
       </genClasses>
-      <genClasses image="false" ecoreClass="mlhim2.ecore#//Common/AuthoredResource">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/language"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/locale"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/description"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/contributor"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/coverage"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/license"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/creator"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/created"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/dateCopyrighted"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/identifier"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/issued"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/relation"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/replaces"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/rightsHolder"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/source"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/subject"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Common/AuthoredResource/title"/>
-      </genClasses>
     </nestedGenPackages>
     <nestedGenPackages prefix="Entity" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Entity">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Entity.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Entity.html"/>
-      </genAnnotations>
       <genClasses image="false" ecoreClass="mlhim2.ecore#//Entity/Party">
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Entity/Party/valid_time_begin"/>
         <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Entity/Party/valid_time_end"/>
@@ -364,19 +354,58 @@
       </genClasses>
     </nestedGenPackages>
     <nestedGenPackages prefix="Constraint" disposableProviderFactory="true" ecorePackage="mlhim2.ecore#//Constraint">
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter";>
-        <genAnnotations source="../schemas/mlhim2.Constraint.xsd"/>
-      </genAnnotations>
-      <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.emf.exporter.html";>
-        <genAnnotations source="../html/mlhim2.Constraint.html"/>
-      </genAnnotations>
       <genClasses ecoreClass="mlhim2.ecore#//Constraint/CCD">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mlhim2.ecore#//Constraint/CCD/definition"/>
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
             ecoreFeature="ecore:EReference mlhim2.ecore#//Constraint/CCD/ontology"/>
-      </genClasses>
-      <genClasses ecoreClass="mlhim2.ecore#//Constraint/Ontology"/>
+        <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference mlhim2.ecore#//Constraint/CCD/metadata"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Constraint/Ontology">
+        <genOperations ecoreOperation="mlhim2.ecore#//Constraint/Ontology/ev_definitions">
+          <genParameters ecoreParameter="mlhim2.ecore#//Constraint/Ontology/ev_definitions/msgid"/>
+        </genOperations>
+        <genOperations ecoreOperation="mlhim2.ecore#//Constraint/Ontology/lookup_table">
+          <genParameters ecoreParameter="mlhim2.ecore#//Constraint/Ontology/lookup_table/urn"/>
+          <genParameters ecoreParameter="mlhim2.ecore#//Constraint/Ontology/lookup_table/keystr"/>
+        </genOperations>
+      </genClasses>
+      <genClasses image="false" ecoreClass="mlhim2.ecore#//Constraint/MetaData">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/MetaData/metadata_version"/>
+      </genClasses>
+      <genClasses image="false" ecoreClass="mlhim2.ecore#//Constraint/DCMI">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/language"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/locale"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/description"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/contributor"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/coverage"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/license"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/creator"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/created"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/dateCopyrighted"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/identifier"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/issued"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/relation"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/replaces"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/rightsHolder"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/source"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/subject"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/DCMI/title"/>
+      </genClasses>
+      <genClasses ecoreClass="mlhim2.ecore#//Constraint/caDSR">
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/public_id"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/version"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/long_name"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/short_name"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/preferred_question_text"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/definition"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/data_element_concept"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/value_domain"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/context"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/workflow_status"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/origin"/>
+        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute mlhim2.ecore#//Constraint/caDSR/registration_status"/>
+      </genClasses>
     </nestedGenPackages>
   </genPackages>
 </genmodel:GenModel>