mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 205
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Mon 2011-10-10 14:15:31 -0500
message:
  Began working on the demographic (formerly entity) package.
modified:
  mlhim2-emf/org.mlhim2/mlhim2.ecore


--
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/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-07 15:15:20 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-10 19:15:31 +0000
@@ -132,16 +132,23 @@
     <eClassifiers xsi:type="ecore:EClass" name="DvDate" eSuperTypes="#//datatypes/DvDateTime"/>
     <eClassifiers xsi:type="ecore:EClass" name="DvTime" eSuperTypes="#//datatypes/DvDateTime"/>
   </eSubpackages>
-  <eSubpackages name="entity">
+  <eSubpackages name="demographic">
     <eClassifiers xsi:type="ecore:EClass" name="Party" abstract="true" eSuperTypes="#//common/Locatable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//entity/Party"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//entity/Party"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//entity/Party"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//entity/Party"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//entity/Party"/>
+    <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//demographic/Actor"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//demographic/Actor"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//demographic/Actor"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//demographic/Actor"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Agent" eSuperTypes="#//demographic/Actor"/>
     <eClassifiers xsi:type="ecore:EClass" name="Relationship" eSuperTypes="#//common/Locatable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Location" eSuperTypes="#//common/Locatable"/>
-    <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="GeographicLocation" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="CommunicationsEvent" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ContactMechanism" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Case" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="GeographicBoundary" eSuperTypes="#//common/Locatable"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//demographic/Party"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Actor" eSuperTypes="#//demographic/Party"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Address" eSuperTypes="#//demographic/ContactMechanism"/>
+    <eClassifiers xsi:type="ecore:EClass" name="ElectronicMedia" eSuperTypes="#//demographic/ContactMechanism"/>
   </eSubpackages>
   <eSubpackages name="common">
     <eClassifiers xsi:type="ecore:EClass" name="Locatable" abstract="true">
@@ -173,7 +180,7 @@
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="PartyRelated" eSuperTypes="#//common/PartyIdentified">
       <eStructuralFeatures xsi:type="ecore:EReference" name="relationship" lowerBound="1"
-          eType="#//entity/Relationship"/>
+          eType="#//demographic/Relationship"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Participation">
       <eStructuralFeatures xsi:type="ecore:EReference" name="performer" lowerBound="1"
@@ -200,7 +207,7 @@
     <eClassifiers xsi:type="ecore:EClass" name="FeederAuditDetails">
       <eStructuralFeatures xsi:type="ecore:EReference" name="system_id" eType="#//datatypes/DvIdentifier"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="provider" eType="#//common/PartyIdentified"/>
-      <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//entity/Location"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//demographic/GeographicLocation"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="time" eType="#//datatypes/DvDateTime"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="subject" eType="#//common/PartyProxy"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="version_id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -284,7 +291,7 @@
           upperBound="-1" eType="#//common/Participation"/>
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="workflow_id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
-          eType="#//entity/Relationship"/>
+          eType="#//demographic/Relationship"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="attestation" eType="#//common/Attestation"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="CareEntry" eSuperTypes="#//content/Entry">