Fix ips datatypes conflicts

cdaxehealth-model/pom.xml

@@ -73,6 +73,22 @@
             <version>2.6</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- Junit 5 -->
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.6.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 

cdaxehealth-model/src/main/resources/cdaxehealth/modelsDefinition.xml

@@ -11,22 +11,22 @@
 			<identifier>datatypes-ips</identifier>
 			<path>/path/to/model/datatypes-ips-model/datatypes-ips.uml</path>
 			<relativeXMIPath>../../datatypes-ips-model/datatypes-ips.uml</relativeXMIPath>
-			<templateIdentifierUMLID>_CuEO9q70EbGxJei_o6JmIA</templateIdentifierUMLID>
+			<templateIdentifierUMLID>_CuEO9q70EeFxJei_o6JmIA</templateIdentifierUMLID>
 		</modelUMLDesc>
 		<modelUMLDesc>
 		    <identifier>cda</identifier>
-		    <path>/path/to/model/cdaxehealth-model/modelad2/cda.uml</path>
-		    <relativeXMIPath>../../cdaxehealth-model/modelad2/cda.uml</relativeXMIPath>
+		    <path>/path/to/model/cdaxehealth-model/modelxeh/cda.uml</path>
+		    <relativeXMIPath>../../cdaxehealth-model/modelxeh/cda.uml</relativeXMIPath>
 		</modelUMLDesc>
 		<modelUMLDesc>
 			<identifier>pharm</identifier>
-			<path>/path/to/model/cdaxehealth-model/modelad2/pharm.uml</path>
-			<relativeXMIPath>../../cdaxehealth-model/modelad2/pharm.uml</relativeXMIPath>
+			<path>/path/to/model/cdaxehealth-model/modelxeh/pharm.uml</path>
+			<relativeXMIPath>../../cdaxehealth-model/modelxeh/pharm.uml</relativeXMIPath>
 		</modelUMLDesc>
 		<modelUMLDesc>
 			<identifier>lab</identifier>
-			<path>/path/to/model/cdaxehealth-model/modelad2/lab.uml</path>
-			<relativeXMIPath>../../cdaxehealth-model/modelad2/lab.uml</relativeXMIPath>
+			<path>/path/to/model/cdaxehealth-model/modelxeh/lab.uml</path>
+			<relativeXMIPath>../../cdaxehealth-model/modelxeh/lab.uml</relativeXMIPath>
 		</modelUMLDesc>
 		<modelUMLDesc>
 		    <identifier>nblock</identifier>

cdaxehealth-model/src/main/resources/modelxeh/cda.uml

@@ -2215,7 +2215,9 @@ The following types are used for structural RIM attributes</body>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DAHm7a70YpGxJei_o6JmIA"/>
         </ownedAttribute>
-      <ownedAttribute xmi:id="_DAHm7q70EeGxJei_o6JmIA" name="effectiveTime" type="_IpuEUJQHEemWVM-pfuia0A" isOrdered="true" aggregation="composite" association="_DAHnMK70EeGxJei_o6JmIA"/>
+      <ownedAttribute xmi:id="_DAHm7q70EeGxJei_o6JmIA" name="effectiveTime" isOrdered="true" aggregation="composite" association="_DAHnMK70EeGxJei_o6JmIA">
+          <type xmi:type="uml:Class" href="../../datatypes-model/models/datatypes.uml#_CuDnHa70EeGxJei_o6JmIA"/>
+      </ownedAttribute>
       <ownedAttribute xmi:id="_DAHm7670EeGxJei_o6JmIA" name="confidentialityCode" isOrdered="true" aggregation="composite" association="_DAHnMq70EeGxJei_o6JmIA">
         <type xmi:type="uml:Class" href="../../datatypes-ips-model/datatypes-ips.uml#_CuENlK70EeGxJei_o6JmIA"/>
       </ownedAttribute>
@@ -5967,7 +5969,7 @@ The following types are used for structural RIM attributes</body>
       <ownedAttribute xmi:id="_75kcQOvgEeemYNdmj6WL9w" name="asContent" isOrdered="true" aggregation="composite">
         <type xmi:type="uml:Class" href="pharm.uml#_VzVQC886EeGVX9h3ivlQvw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_75kcQevgEeemYNdmj6WL9w" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_75kcQevgEeemYNdmj6WL9w" value="*"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_75kcQuvgEeemYNdmj6WL9w"/>
       </ownedAttribute>
       <ownedAttribute xmi:id="_8f7RoOvgEeemYNdmj6WL9w" name="asSpecializedKind" isOrdered="true" aggregation="composite">