mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 261
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Thu 2012-05-31 11:33:14 -0300
message:
  Changed root element name to ccd_def for CCDs and did the RM aggregation in ccd.xsd in order to remove mlhim2.xsd.
removed:
  schemas/mlhim2.xsd
modified:
  schemas/ccd.xsd
  schemas/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 'schemas/ccd.xsd'
--- schemas/ccd.xsd	2012-05-29 20:52:18 +0000
+++ schemas/ccd.xsd	2012-05-31 14:33:14 +0000
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
+xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; 
+attributeFormDefault="qualified" elementFormDefault="qualified" 
+targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/datatypes.xsd"/>
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/content.xsd"/>
   
-  <xs:complexType name="CCD">
+<xs:element name="ccd" type="mlhim2:ccd_def"></xs:element>
+
+  <xs:complexType name="ccd_def">
     <xs:complexContent>
       <xs:extension base="xs:anySimpleType">
         <xs:sequence>
@@ -13,4 +19,4 @@
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>

=== modified file 'schemas/datatypes.xsd'
--- schemas/datatypes.xsd	2012-05-29 20:52:18 +0000
+++ schemas/datatypes.xsd	2012-05-31 14:33:14 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
   
   <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
   
@@ -28,12 +29,22 @@
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="valid_trues" type="xs:string"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" name="valid_falses" type="xs:string"/>
-          <xs:element name="bool_dv" type="xs:string"/>
+          <xs:element maxOccurs="1" minOccurs="0" name="bool_dv" type="xs:string"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  
+
+  <xs:complexType name="DvURI">
+    <xs:complexContent>
+      <xs:restriction base="mlhim2:DvAny">
+        <xs:sequence>
+          <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:anyURI"/>
+        </xs:sequence> 
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+    
   <xs:complexType name="DvString">
     <xs:complexContent>
       <xs:extension base="mlhim2:DvAny">
@@ -45,21 +56,16 @@
     </xs:complexContent>
   </xs:complexType>
   
-  <xs:complexType name="DvURI">
-    <xs:complexContent>
-      <xs:restriction base="mlhim2:DvString">
-        <xs:sequence>
-          <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:anyURI"/>
-        </xs:sequence> 
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-  
+
   <xs:complexType name="DvNormalizedString">
     <xs:complexContent>
       <xs:restriction base="mlhim2:DvString">
         <xs:sequence>
-          <xs:element maxOccurs="1" minOccurs="0" name="string_dv" type="xs:normalizedString"/>
+          <xs:element maxOccurs="1" minOccurs="0" name="string_dv">
+          <xs:simpleType>
+          <xs:restriction base="xs:normalizedString"></xs:restriction>
+          </xs:simpleType>
+          </element>
         </xs:sequence> 
       </xs:restriction>
     </xs:complexContent>
@@ -306,4 +312,4 @@
     </xs:complexContent>
   </xs:complexType>
   
-</xs:schema>
\ No newline at end of file
+</xs:schema>

=== removed file 'schemas/mlhim2.xsd'
--- schemas/mlhim2.xsd	2012-05-29 20:52:18 +0000
+++ schemas/mlhim2.xsd	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- Copyright 2011 Timothy W. Cook and Contributors. See http://www.mlhim.org--><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:mlhim2="http://www.mlhim.org/xmls/mlhim2/2_3_0"; attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_0"; version="2.3.0">
-  <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/datatypes.xsd"/>
-  <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/common.xsd"/>
-  <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/structures.xsd"/>
-  <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/content.xsd"/>
-  <xs:include schemaLocation="http://www.mlhim.org/xmls/mlhim2/2_3_0/ccd.xsd"/>
-  
-  <xs:annotation><xs:documentation>
-      Multi-Level Health Information Modelling Reference Model - Use this schema when creating bindings to other languages. 
-    </xs:documentation></xs:annotation>
-  
-</xs:schema>
\ No newline at end of file