From 762f36b184fbcbfbc7639a86cba826dafac6d915 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Fri, 12 Aug 2016 10:21:29 +0200
Subject: [PATCH] [New] Creating a XML Schema for Strolch model as XML

---
 .../src/test/resources/data/StrolchModel.xsd  | 20 ++++++++++++-------
 .../test/resources/data/StrolchModelAll.xml   |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/li.strolch.model/src/test/resources/data/StrolchModel.xsd b/li.strolch.model/src/test/resources/data/StrolchModel.xsd
index 95885a181..8703e2dd7 100644
--- a/li.strolch.model/src/test/resources/data/StrolchModel.xsd
+++ b/li.strolch.model/src/test/resources/data/StrolchModel.xsd
@@ -4,11 +4,13 @@
 	<xs:element name="StrolchModel" type="StrolchModelType" />
 
 	<xs:complexType name="StrolchModelType">
-		<xs:sequence>
-			<xs:element type="IncludeFileType" name="IncludeFile" maxOccurs="unbounded" minOccurs="0" />
-			<xs:element type="OrderType" name="Order" maxOccurs="unbounded" minOccurs="0" />
-			<xs:element type="ResourceType" name="Resource" maxOccurs="unbounded" minOccurs="0" />
-			<xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
+		<xs:sequence maxOccurs="unbounded" minOccurs="0">
+			<xs:choice>
+				<xs:element type="IncludeFileType" name="IncludeFile" maxOccurs="unbounded" minOccurs="0" />
+				<xs:element type="OrderType" name="Order" maxOccurs="unbounded" minOccurs="0" />
+				<xs:element type="ResourceType" name="Resource" maxOccurs="unbounded" minOccurs="0" />
+				<xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
+			</xs:choice>
 		</xs:sequence>
 	</xs:complexType>
 
@@ -58,8 +60,12 @@
 			<xs:element type="VersionType" name="Version" maxOccurs="1" minOccurs="0" />
 			<xs:element type="ParameterBagType" name="ParameterBag" maxOccurs="unbounded" minOccurs="0" />
 			<xs:element type="PoliciesType" name="Policies" maxOccurs="1" minOccurs="0" />
-			<xs:element type="ActionType" name="Action" maxOccurs="unbounded" minOccurs="0" />
-			<xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
+			<xs:sequence maxOccurs="unbounded" minOccurs="0">
+				<xs:choice>
+					<xs:element type="ActionType" name="Action" maxOccurs="unbounded" minOccurs="0" />
+					<xs:element type="ActivityType" name="Activity" maxOccurs="unbounded" minOccurs="0" />
+				</xs:choice>
+			</xs:sequence>
 		</xs:sequence>
 		<xs:attribute type="xs:string" name="Id" />
 		<xs:attribute type="xs:string" name="Name" />
diff --git a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml b/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
index 823c75249..4ca4741dd 100644
--- a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
+++ b/li.strolch.model/src/test/resources/data/StrolchModelAll.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xsi:noNamespaceSchemaLocation="StrolchModel.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:noNamespaceSchemaLocation="StrolchModel.xsd">
 
 	<Order Id="@test1" Name="Test Order" Type="Order">
 		<Version Version="0" CreatedBy="test" CreatedAt="2012-11-30T18:12:05.628+01:00" Deleted="false" />