From 7f64be6c0e2e0f77d688c88fa64021a2e093b5db Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Thu, 4 Apr 2019 10:49:04 +0200
Subject: Update zusemsg schemes to v2.0.b

---
 .../resources/zusemsg/zuse_mypersondata_en_p2.xsd  | 38 ++++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'src/main/resources/zusemsg/zuse_mypersondata_en_p2.xsd')

diff --git a/src/main/resources/zusemsg/zuse_mypersondata_en_p2.xsd b/src/main/resources/zusemsg/zuse_mypersondata_en_p2.xsd
index 9a27360..271e56e 100644
--- a/src/main/resources/zusemsg/zuse_mypersondata_en_p2.xsd
+++ b/src/main/resources/zusemsg/zuse_mypersondata_en_p2.xsd
@@ -9,15 +9,21 @@ PersonData Blueprint solution for use with ZUSE Spezifikation, containes slimmed
 	<xs:annotation>
 		<xs:documentation>This version of person deploys only global elements. All types derived from abstract types have been replaced by substitution groups</xs:documentation>
 	</xs:annotation>
-	<!-- ### structure of a person  ### -->
-	<xs:element name="PersonData" type="p:PersonDataType">
+	<!-- ### structure for person data ### -->
+	<xs:element name="Person" type="p:AbstractPersonType" abstract="true"/>
+	<!-- ### structure of a person with Identification ### -->
+	<xs:element name="PersonAndIdentification" type="p:PersonAndIdentificationType">
+		<xs:annotation>
+			<xs:documentation>element of person details type</xs:documentation>
+		</xs:annotation>
+	</xs:element>
+	<!-- ### structure of a person with address### -->
+	<xs:element name="PersonAndAddress" type="p:PersonAndAddressType">
 		<xs:annotation>
 			<xs:documentation>element of signed person datastructure type</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<!-- ### base type for person data ### -->
-	<xs:element name="Person" type="p:AbstractPersonType" abstract="true"/>
-	<!-- ### physical person and corporate body ### -->
+	<!-- ### physical person, corporate body and authority ### -->
 	<xs:element name="Authority" type="p:AuthorityType" substitutionGroup="p:Person">
 		<xs:annotation>
 			<xs:documentation>Behörde, nur diese darf in RSa-Qualität versenden</xs:documentation>
@@ -30,7 +36,7 @@ PersonData Blueprint solution for use with ZUSE Spezifikation, containes slimmed
 	</xs:element>
 	<xs:element name="PhysicalPerson" type="p:PhysicalPersonType" substitutionGroup="p:Person">
 		<xs:annotation>
-			<xs:documentation>element of physical person type, dreived from Person (abstract)</xs:documentation>
+			<xs:documentation>element of physical person type, dreived from Person </xs:documentation>
 		</xs:annotation>
 	</xs:element>
 	<xs:element name="CorporateBody" type="p:CorporateBodyType" substitutionGroup="p:Person">
@@ -53,7 +59,7 @@ PersonData Blueprint solution for use with ZUSE Spezifikation, containes slimmed
 			<xs:documentation>part of an organisation, see also X.500 ou (eg departement, section, branch, ...) , compare Organisation</xs:documentation>
 		</xs:annotation>
 	</xs:element>
-	<xs:element name="DateOfBirth" type="p:DateOfBirthType">
+	<xs:element name="DateOfBirth" type="xs:date">
 		<xs:annotation>
 			<xs:documentation>date of birth, compare Geburtsdatum</xs:documentation>
 		</xs:annotation>
@@ -107,7 +113,17 @@ PersonData Blueprint solution for use with ZUSE Spezifikation, containes slimmed
 		<xs:attribute name="Id" type="xs:ID" use="optional"/>
 	</xs:complexType>
 	<!--### Complex types ###-->
-	<xs:complexType name="PersonDataType">
+	<xs:complexType name="PersonAndIdentificationType">
+		<xs:annotation>
+			<xs:documentation>person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
+		</xs:annotation>
+		<xs:sequence>
+			<xs:element ref="p:Identification"/>
+			<xs:element ref="p:Person"/>
+		</xs:sequence>
+		<xs:attribute name="Id" type="xs:ID" use="optional"/>
+	</xs:complexType>
+	<xs:complexType name="PersonAndAddressType">
 		<xs:annotation>
 			<xs:documentation>signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).</xs:documentation>
 		</xs:annotation>
@@ -317,12 +333,6 @@ PersonData Blueprint solution for use with ZUSE Spezifikation, containes slimmed
 		</xs:complexContent>
 	</xs:complexType>
 	<!-- ### strings of defined maximum lenght for use with ZMR address #### -->
-	<xs:simpleType name="DateOfBirthType">
-		<xs:annotation>
-			<xs:documentation>simple type for dates (union), which may omit day and/or month</xs:documentation>
-		</xs:annotation>
-		<xs:union memberTypes="xs:date xs:gYearMonth xs:gYear"/>
-	</xs:simpleType>
 	<xs:simpleType name="string3">
 		<xs:restriction base="xs:string">
 			<xs:maxLength value="3"/>
-- 
cgit v1.2.3