mlhim-specs-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 295
committer: Timothy W. Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-specs
timestamp: Tue 2012-08-28 11:53:10 -0300
message:
  Changed xml version to 1.0
modified:
  CHANGELOG.txt
  schemas/mlhim2.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 'CHANGELOG.txt'
--- CHANGELOG.txt	2012-08-26 23:08:38 +0000
+++ CHANGELOG.txt	2012-08-28 14:53:10 +0000
@@ -1,12 +1,15 @@
-This is the Change log for MLHIM specifications.  First created for the 2.3.0 to 2.3.1 transition. All entries are in reverse chronological order.
+This is the Change log for the MLHIM specifications.  First created for the 2.3.0 to 2.3.1 transition. All entries are in reverse chronological order.
 
 === 2.3.1 Changes ===
-* 2012-08-26 *
 - Modified Slot to have a mandatory slot_name element of xs:string type and a slot_data element of xs:anyType. This is entered by the modeller into the CDD and is set as a fixed value on the element. The slot_data element is defined in a CCD by a complexType that is a sequence of the root elements extracted from the CCDs of the included in the slot.  The CDD will allow the modeller to indicate if the Slotted CCDs are optional or mandatory.  This will insert minOccurs = "0" if it is optional in the Slot. Also note that when a CCD is included in a Slot; the CCD with the Slot must also have an <include schemaLocation=""/> 
 to point to the Slotted CCD. 
-- 
+
+- Changed the element name 'subject' in ClusterType to 'cluster_subject' to avoid (human) ambiguity with other elements in other types.
+- Commented out the substitution groups in mlhim2.xsd.  
+- Changed XML version back to 1.0 in schema.  Time to investigate furthre into the schema versioning namspace and how to apply it in CCDs.
+
 
 
 === 2.3.0 Changes ===
--Nothing recorded in this log.  See the BZR commit entries.
+-Nothing prior, recorded in this log.  See the BZR commit entries.
 

=== modified file 'schemas/mlhim2.xsd'
--- schemas/mlhim2.xsd	2012-08-26 23:08:38 +0000
+++ schemas/mlhim2.xsd	2012-08-28 14:53:10 +0000
@@ -1,10 +1,12 @@
-<?xml version="1.1" encoding="UTF-8"?>
+<?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_1"; attributeFormDefault="qualified" elementFormDefault="qualified" 
   targetNamespace="http://www.mlhim.org/xmls/mlhim2/2_3_1"; version="2.3.1">  
 
   
+<!--  
+  Apparently these substitution groups are not needed.  But we will leave them here as a form of documentation anyway.  
   <xs:element name="Entry" abstract="true" substitutionGroup="mlhim2:Definition" type="mlhim2:EntryType"/>
   <xs:element name="CareEntry" substitutionGroup="mlhim2:Entry" type="mlhim2:CareEntryType"/>
   <xs:element name="AdminEntry" substitutionGroup="mlhim2:Entry" type="mlhim2:AdminEntryType"/>
@@ -79,7 +81,7 @@
   <xs:element name="DvMonthDay" substitutionGroup="mlhim2:DvTemporal" type="mlhim2:DvMonthDayType"/>
   
   
-
+-->
 
 
 
@@ -92,7 +94,6 @@
 <xs:annotation>
 <xs:documentation>
 Serves as a common ancestor of all datatypes in MLHIM models.
-
 </xs:documentation>
 </xs:annotation>
 <xs:sequence>
@@ -771,6 +772,7 @@
 <xs:complexContent>
 <xs:extension base="mlhim2:LocatableType">
 <xs:sequence>
+<xs:element name="party_name" type="xs:string"/>  
 <xs:element name="external_ref" type="mlhim2:DvURIType"/>
 </xs:sequence> 
 </xs:extension>
@@ -793,7 +795,6 @@
 <xs:complexContent>
 <xs:extension base="mlhim2:PartyProxyType">
 <xs:sequence>
-<xs:element name="party_name" type="xs:string"/>
 <xs:element name="identities" type="mlhim2:DvIdentifierType"/>
 </xs:sequence> 
 </xs:extension>
@@ -807,7 +808,11 @@
 </xs:documentation>
 </xs:annotation>
 <xs:complexContent>
-<xs:extension base="mlhim2:PartyProxyType"/>
+<xs:extension base="mlhim2:PartyProxyType">
+  <xs:sequence>
+    <xs:element name="party_name" type="xs:string" fixed="Self"/>
+  </xs:sequence>
+</xs:extension>
 </xs:complexContent>
 </xs:complexType>
 
@@ -1041,6 +1046,8 @@
     </xs:complexContent>
     
   </xs:complexType>
+  
+  
   <xs:complexType name="ClusterType">
     <xs:annotation>
       <xs:documentation>
@@ -1051,12 +1058,13 @@
       <xs:extension base="mlhim2:ItemType">
         <xs:sequence>
           <xs:element maxOccurs="unbounded" minOccurs="1" name="items" type="mlhim2:ItemType"/>
-          <xs:element maxOccurs="1" minOccurs="1" name="subject" type="xs:string"/>
+          <xs:element maxOccurs="1" minOccurs="1" name="cluster_subject" type="xs:string"/>
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   
+  
   <xs:complexType name="ElementType">
     <xs:annotation>
       <xs:documentation>