← Back to team overview

mlhim-specs-dev team mailing list archive

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

[Branch ~mlhim-specs-dev/mlhim-specs/main] Rev 208: Completed update to Sergios demographic model.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 208
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Sun 2011-10-16 10:47:35 -0500
message:
  Completed update to Sergios demographic model.
modified:
  mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs
  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/.settings/org.eclipse.core.resources.prefs'
--- mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs	2011-10-16 12:41:55 +0000
+++ mlhim2-emf/org.mlhim2/.settings/org.eclipse.core.resources.prefs	2011-10-16 15:47:35 +0000
@@ -1,3 +1,3 @@
-#Thu Oct 13 11:46:40 CDT 2011
+#Sun Oct 16 09:53:22 CDT 2011
 eclipse.preferences.version=1
 encoding/mlhim2.ecore=UTF-8

=== modified file 'mlhim2-emf/org.mlhim2/mlhim2.ecore'
--- mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-16 12:49:32 +0000
+++ mlhim2-emf/org.mlhim2/mlhim2.ecore	2011-10-16 15:47:35 +0000
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"; name="mlhim2"
-    nsURI="http://mlhim2/1.0"; nsPrefix="mlhim2">
+    nsURI="http://www.mlhim.org/mlhim2"; nsPrefix="mlhim2">
   <eSubpackages name="datatypes" nsURI="http://www.mlhim.org/mlhim2/datatypes"; nsPrefix="mlhim2">
     <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true">
       <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//common/ExceptionalValue"/>
@@ -127,22 +127,92 @@
   </eSubpackages>
   <eSubpackages name="demographic" nsURI="http://www.mlhim.org/mlhim2/demographic";
       nsPrefix="mlhim2">
-    <eClassifiers xsi:type="ecore:EClass" name="Party" abstract="true" eSuperTypes="#//common/Locatable"/>
-    <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="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="Party" abstract="true" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="ev" eType="#//common/ExceptionalValue"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_begin" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="valid_time_end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="relationships" upperBound="-1"
+          eType="#//demographic/Relationship"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="locations" upperBound="-1"
+          eType="#//demographic/GeographicLocation"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="roles" upperBound="-1"
+          eType="#//demographic/Role"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" upperBound="-1"
+          eType="#//datatypes/DvIdentifier"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="NonHuman" eSuperTypes="#//demographic/Actor">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="#//demographic/Actor">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="#//demographic/Actor">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Organization" eSuperTypes="#//demographic/Actor">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Agent" eSuperTypes="#//demographic/Actor">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Relationship" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="targets" lowerBound="1"
+          upperBound="-1" eType="#//datatypes/DvToken"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="is_local" eType="#//datatypes/DvBoolean"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="relationship_type" lowerBound="1"
+          eType="#//datatypes/DvString"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="GeographicLocation" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="CommunicationsEvent" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="case" lowerBound="1"
+          eType="#//demographic/Case"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="contact" lowerBound="1"
+          eType="#//demographic/ContactMechanism"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="ContactMechanism" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
+          eType="#//datatypes/DvString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="is_primary" lowerBound="1"
+          eType="#//datatypes/DvBoolean"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Case" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="GeographicBoundary" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Role" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="description" lowerBound="1"
+          eType="#//datatypes/DvString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="details" lowerBound="1"
+          eType="#//structures/Item"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="is_primary" lowerBound="1"
+          eType="#//datatypes/DvBoolean"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Actor" eSuperTypes="#//demographic/Party">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="languages" upperBound="-1"
+          eType="#//datatypes/DvCodedString"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Address" eSuperTypes="#//demographic/ContactMechanism"/>
     <eClassifiers xsi:type="ecore:EClass" name="ElectronicMedia" eSuperTypes="#//demographic/ContactMechanism"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Capability" eSuperTypes="#//common/Locatable">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="credentials" lowerBound="1"
+          eType="#//structures/Item"/>
+    </eClassifiers>
   </eSubpackages>
   <eSubpackages name="common" nsURI="http://www.mlhim.org/mlhim2/common"; nsPrefix="mlhim2">
     <eClassifiers xsi:type="ecore:EClass" name="Locatable" abstract="true">
  Thread Previous • Date Previous • • Thread Next