From a166e3db6fdaf26fbde345cfc42ff4911fb89f05 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 16 Mar 2023 21:46:50 +0100
Subject: [PATCH] [Major] Updated strolch model XSD to 2.0

---
 .../resources/realmtest/data/DefaultRealm.xml |  4 +--
 .../test/resources/realmtest/data/MyRealm.xml |  4 +--
 .../test/resources/realmtest/data/Orders.xml  |  4 +--
 .../resources/realmtest/data/OtherRealm.xml   |  4 +--
 .../resources/realmtest/data/Resources.xml    |  4 +--
 .../transienttest/data/Activities.xml         |  4 +--
 .../resources/transienttest/data/Enums.xml    |  4 +--
 .../resources/transienttest/data/Orders.xml   |  4 +--
 .../transienttest/data/Resources.xml          |  4 +--
 .../transienttest/data/StrolchModel.xml       |  4 +--
 .../versioningtest/data/Activities.xml        |  4 +--
 .../resources/versioningtest/data/Orders.xml  |  4 +--
 .../versioningtest/data/Resources.xml         |  4 +--
 .../versioningtest/data/StrolchModel.xml      |  4 +--
 ...{StrolchModel-1.6.xsd => StrolchModel.xsd} |  6 ++--
 .../src/test/resources/data/StrolchModel.xml  | 29 ++++++++++---------
 .../test/resources/data/StrolchModelAll.xml   |  2 +-
 .../resources/data/activities/Activities.xml  |  4 +--
 .../src/test/resources/data/orders/Orders.xml |  4 +--
 .../test/resources/data/orders/Templates.xml  |  4 +--
 .../resources/data/resources/Resources.xml    |  4 +--
 .../resources/data/resources/Templates.xml    |  4 +--
 .../cachedJsonRuntime/data/StrolchModel.xml   |  4 +--
 .../data/StrolchModel.xml                     |  4 +--
 .../cachedRuntime/data/StrolchModel.xml       |  4 +--
 .../data/StrolchModel.xml                     |  4 +--
 .../cachedRuntime/data/DefaultRealm.xml       |  4 +--
 .../executiontest/data/StrolchModel.xml       |  4 +--
 .../migrationstest/data/StrolchModel.xml      |  4 +--
 .../migrations/data/defaultRealm/0.1.0.xml    |  4 +--
 .../migrations/data/defaultRealm/0.1.1.xml    |  4 +--
 .../migrations/data/defaultRealm/0.5.2.xml    |  4 +--
 .../migrations/data/defaultRealm/1.0.0.xml    |  4 +--
 .../migrations/data/defaultRealm/1.0.5.xml    |  4 +--
 .../migrations/data/defaultRealm/1.1.1.xml    |  4 +--
 .../reporttest/data/StrolchModel.xml          |  4 +--
 .../resources/svctest/data/Activities.xml     |  4 +--
 .../src/test/resources/svctest/data/Enums.xml |  4 +--
 .../test/resources/svctest/data/Orders.xml    |  4 +--
 .../test/resources/svctest/data/Resources.xml |  4 +--
 .../resources/svctest/data/StrolchModel.xml   |  4 +--
 .../resources/transienttest/data/Enums.xml    |  4 +--
 .../resources/transienttest/data/Orders.xml   |  4 +--
 .../transienttest/data/Resources.xml          |  4 +--
 .../transienttest/data/StrolchModel.xml       |  4 +--
 .../transienttest/data/example-model.xml      |  2 +-
 .../withPrivilegeRuntime/data/Enums.xml       |  4 +--
 .../withPrivilegeRuntime/data/Orders.xml      |  4 +--
 .../withPrivilegeRuntime/data/Resources.xml   |  4 +--
 .../data/StrolchModel.xml                     |  4 +--
 50 files changed, 112 insertions(+), 111 deletions(-)
 rename model/src/main/resources/{StrolchModel-1.6.xsd => StrolchModel.xsd} (97%)

diff --git a/agent/src/test/resources/realmtest/data/DefaultRealm.xml b/agent/src/test/resources/realmtest/data/DefaultRealm.xml
index bb8be57e3..c8d9fff99 100644
--- a/agent/src/test/resources/realmtest/data/DefaultRealm.xml
+++ b/agent/src/test/resources/realmtest/data/DefaultRealm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/realmtest/data/MyRealm.xml b/agent/src/test/resources/realmtest/data/MyRealm.xml
index 3bcf31401..891b4ec7c 100644
--- a/agent/src/test/resources/realmtest/data/MyRealm.xml
+++ b/agent/src/test/resources/realmtest/data/MyRealm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/realmtest/data/Orders.xml b/agent/src/test/resources/realmtest/data/Orders.xml
index be9537285..8f3f6b071 100644
--- a/agent/src/test/resources/realmtest/data/Orders.xml
+++ b/agent/src/test/resources/realmtest/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/realmtest/data/OtherRealm.xml b/agent/src/test/resources/realmtest/data/OtherRealm.xml
index 51464b078..0b65f849d 100644
--- a/agent/src/test/resources/realmtest/data/OtherRealm.xml
+++ b/agent/src/test/resources/realmtest/data/OtherRealm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="OtherRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/realmtest/data/Resources.xml b/agent/src/test/resources/realmtest/data/Resources.xml
index c3bba8703..43182427d 100644
--- a/agent/src/test/resources/realmtest/data/Resources.xml
+++ b/agent/src/test/resources/realmtest/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/transienttest/data/Activities.xml b/agent/src/test/resources/transienttest/data/Activities.xml
index d895e646f..4458d4457 100644
--- a/agent/src/test/resources/transienttest/data/Activities.xml
+++ b/agent/src/test/resources/transienttest/data/Activities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Activity Id="activity_1" Name="Activity" Type="ActivityType" TimeOrdering="Series">
         <Policies>
diff --git a/agent/src/test/resources/transienttest/data/Enums.xml b/agent/src/test/resources/transienttest/data/Enums.xml
index a94f52973..65eed2fe9 100644
--- a/agent/src/test/resources/transienttest/data/Enums.xml
+++ b/agent/src/test/resources/transienttest/data/Enums.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="salutations" Name="Salutations" Type="Enumeration">
         <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
diff --git a/agent/src/test/resources/transienttest/data/Orders.xml b/agent/src/test/resources/transienttest/data/Orders.xml
index be9537285..8f3f6b071 100644
--- a/agent/src/test/resources/transienttest/data/Orders.xml
+++ b/agent/src/test/resources/transienttest/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/transienttest/data/Resources.xml b/agent/src/test/resources/transienttest/data/Resources.xml
index bf64197fd..cb6104b49 100644
--- a/agent/src/test/resources/transienttest/data/Resources.xml
+++ b/agent/src/test/resources/transienttest/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="otherResource" Name="Yellow" Type="OtherResource">
         <ParameterBag Id="parameters" Name="parameters" Type="Parameters">
             <Parameter Id="color" Name="Color" Type="String" Value="yellow"/>
diff --git a/agent/src/test/resources/transienttest/data/StrolchModel.xml b/agent/src/test/resources/transienttest/data/StrolchModel.xml
index 958307b3c..b49724564 100644
--- a/agent/src/test/resources/transienttest/data/StrolchModel.xml
+++ b/agent/src/test/resources/transienttest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/versioningtest/data/Activities.xml b/agent/src/test/resources/versioningtest/data/Activities.xml
index febae2cdc..d8be67a05 100644
--- a/agent/src/test/resources/versioningtest/data/Activities.xml
+++ b/agent/src/test/resources/versioningtest/data/Activities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Activity Id="activity_1" Name="Activity" Type="ActivityType" TimeOrdering="Series">
         <Policies>
diff --git a/agent/src/test/resources/versioningtest/data/Orders.xml b/agent/src/test/resources/versioningtest/data/Orders.xml
index be9537285..8f3f6b071 100644
--- a/agent/src/test/resources/versioningtest/data/Orders.xml
+++ b/agent/src/test/resources/versioningtest/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/versioningtest/data/Resources.xml b/agent/src/test/resources/versioningtest/data/Resources.xml
index c3bba8703..43182427d 100644
--- a/agent/src/test/resources/versioningtest/data/Resources.xml
+++ b/agent/src/test/resources/versioningtest/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/agent/src/test/resources/versioningtest/data/StrolchModel.xml b/agent/src/test/resources/versioningtest/data/StrolchModel.xml
index 876e74423..2e68f6808 100644
--- a/agent/src/test/resources/versioningtest/data/StrolchModel.xml
+++ b/agent/src/test/resources/versioningtest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/model/src/main/resources/StrolchModel-1.6.xsd b/model/src/main/resources/StrolchModel.xsd
similarity index 97%
rename from model/src/main/resources/StrolchModel-1.6.xsd
rename to model/src/main/resources/StrolchModel.xsd
index 4e8e60d12..25ebefa64 100644
--- a/model/src/main/resources/StrolchModel-1.6.xsd
+++ b/model/src/main/resources/StrolchModel.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-           xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/schema/StrolchModel.xsd"
+           xmlns="https://strolch.li/schema/StrolchModel.xsd"
            elementFormDefault="qualified" attributeFormDefault="unqualified">
 
     <xs:annotation>
-        <xs:documentation>This is Version 1.6.x of the StrolchModel XSD.</xs:documentation>
+        <xs:documentation>This is Version 2.0 of the StrolchModel XSD.</xs:documentation>
     </xs:annotation>
 
     <xs:element name="StrolchModel" type="StrolchModelType"/>
diff --git a/model/src/test/resources/data/StrolchModel.xml b/model/src/test/resources/data/StrolchModel.xml
index d7c98fe1e..203366492 100644
--- a/model/src/test/resources/data/StrolchModel.xml
+++ b/model/src/test/resources/data/StrolchModel.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="StrolchModel-1.6.xsd" xsi:schemaLocation="StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
-	<Order Id="@test1" Name="Test Order" Type="Order">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Order>
-	<Resource Id="@test1" Name="Test Resource" Type="Resource">
-		<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
-			<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
-		</ParameterBag>
-	</Resource>
+    <Order Id="@test1" Name="Test Order" Type="Order">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Order>
+    <Resource Id="@test1" Name="Test Resource" Type="Resource">
+        <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
+            <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
+        </ParameterBag>
+    </Resource>
 
-	<IncludeFile file="resources/Resources.xml" />
-	<IncludeFile file="orders/Orders.xml" />
-	<IncludeFile file="activities/Activities.xml" />
+    <IncludeFile file="resources/Resources.xml"/>
+    <IncludeFile file="orders/Orders.xml"/>
+    <IncludeFile file="activities/Activities.xml"/>
 
 </StrolchModel>
\ No newline at end of file
diff --git a/model/src/test/resources/data/StrolchModelAll.xml b/model/src/test/resources/data/StrolchModelAll.xml
index 00fb460b9..ba7de3ce4 100644
--- a/model/src/test/resources/data/StrolchModelAll.xml
+++ b/model/src/test/resources/data/StrolchModelAll.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd" xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd" xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
 	<IncludeFile file="Include1.xml" />
 	<IncludeFile file="Include2.xml" />
diff --git a/model/src/test/resources/data/activities/Activities.xml b/model/src/test/resources/data/activities/Activities.xml
index db42be9d5..381465640 100644
--- a/model/src/test/resources/data/activities/Activities.xml
+++ b/model/src/test/resources/data/activities/Activities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Activity Id="activity_1" Name="Activity" Type="parentType" TimeOrdering="Series">
         <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
diff --git a/model/src/test/resources/data/orders/Orders.xml b/model/src/test/resources/data/orders/Orders.xml
index 972bdf3b1..166fd29c9 100644
--- a/model/src/test/resources/data/orders/Orders.xml
+++ b/model/src/test/resources/data/orders/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <IncludeFile file="Templates.xml"/>
 
diff --git a/model/src/test/resources/data/orders/Templates.xml b/model/src/test/resources/data/orders/Templates.xml
index 006c3b58c..abed439b3 100644
--- a/model/src/test/resources/data/orders/Templates.xml
+++ b/model/src/test/resources/data/orders/Templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
diff --git a/model/src/test/resources/data/resources/Resources.xml b/model/src/test/resources/data/resources/Resources.xml
index 096b93c29..3420017de 100644
--- a/model/src/test/resources/data/resources/Resources.xml
+++ b/model/src/test/resources/data/resources/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <IncludeFile file="Templates.xml"/>
 
diff --git a/model/src/test/resources/data/resources/Templates.xml b/model/src/test/resources/data/resources/Templates.xml
index 10690ad67..6da936b3f 100644
--- a/model/src/test/resources/data/resources/Templates.xml
+++ b/model/src/test/resources/data/resources/Templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
index 35086cfa0..db7f7f489 100644
--- a/persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
+++ b/persistence-postgresql/src/test/resources/cachedJsonRuntime/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
index 35086cfa0..db7f7f489 100644
--- a/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
+++ b/persistence-postgresql/src/test/resources/cachedJsonRuntimeVersioning/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
index 35086cfa0..db7f7f489 100644
--- a/persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
+++ b/persistence-postgresql/src/test/resources/cachedRuntime/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
index 35086cfa0..db7f7f489 100644
--- a/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
+++ b/persistence-postgresql/src/test/resources/cachedRuntimeVersioning/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyRealmRes" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml b/persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
index 0d2df8fd2..338705cec 100644
--- a/persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
+++ b/persistence-xml/src/test/resources/cachedRuntime/data/DefaultRealm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
diff --git a/service/src/test/resources/executiontest/data/StrolchModel.xml b/service/src/test/resources/executiontest/data/StrolchModel.xml
index 1a446e4b8..1d192fc8f 100644
--- a/service/src/test/resources/executiontest/data/StrolchModel.xml
+++ b/service/src/test/resources/executiontest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="bicycle" Name="Bicycle" Type="Product">
         <TimedState Id="quantity" Name="Quantity" Type="Integer"/>
diff --git a/service/src/test/resources/migrationstest/data/StrolchModel.xml b/service/src/test/resources/migrationstest/data/StrolchModel.xml
index 25402ffac..08f79f6cc 100644
--- a/service/src/test/resources/migrationstest/data/StrolchModel.xml
+++ b/service/src/test/resources/migrationstest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.1.1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/0.5.2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.0.5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
+++ b/service/src/test/resources/migrationstest/data/migrations/data/defaultRealm/1.1.1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/reporttest/data/StrolchModel.xml b/service/src/test/resources/reporttest/data/StrolchModel.xml
index bcc36b1ba..d2f83dbcf 100644
--- a/service/src/test/resources/reporttest/data/StrolchModel.xml
+++ b/service/src/test/resources/reporttest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="slotsByOrderUsageReport" Name="Slots by order usage report" Type="Report">
 
diff --git a/service/src/test/resources/svctest/data/Activities.xml b/service/src/test/resources/svctest/data/Activities.xml
index 7f47584e8..12c7ebf65 100644
--- a/service/src/test/resources/svctest/data/Activities.xml
+++ b/service/src/test/resources/svctest/data/Activities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Activity Id="produceBicycle" Name="Activity" Type="ToStock" TimeOrdering="Series">
         <Action Id="produce" Name="Produce" ResourceId="bicycle" ResourceType="Product" Type="Produce"/>
diff --git a/service/src/test/resources/svctest/data/Enums.xml b/service/src/test/resources/svctest/data/Enums.xml
index 45cd9ad04..e7c8e0a3f 100644
--- a/service/src/test/resources/svctest/data/Enums.xml
+++ b/service/src/test/resources/svctest/data/Enums.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="salutations" Name="Salutations" Type="Enumeration">
         <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
diff --git a/service/src/test/resources/svctest/data/Orders.xml b/service/src/test/resources/svctest/data/Orders.xml
index 2f3c1c5cf..bed30df9d 100644
--- a/service/src/test/resources/svctest/data/Orders.xml
+++ b/service/src/test/resources/svctest/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="myCarOrder" Name="Car Production Order" Type="ProductionOrder" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/svctest/data/Resources.xml b/service/src/test/resources/svctest/data/Resources.xml
index ff5a99b46..b851cd078 100644
--- a/service/src/test/resources/svctest/data/Resources.xml
+++ b/service/src/test/resources/svctest/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="Facility" Name="Hospital" Type="Location">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/service/src/test/resources/svctest/data/StrolchModel.xml b/service/src/test/resources/svctest/data/StrolchModel.xml
index b8139a4e7..ef79fc161 100644
--- a/service/src/test/resources/svctest/data/StrolchModel.xml
+++ b/service/src/test/resources/svctest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <IncludeFile file="Enums.xml"/>
     <IncludeFile file="Resources.xml"/>
diff --git a/service/src/test/resources/transienttest/data/Enums.xml b/service/src/test/resources/transienttest/data/Enums.xml
index 45cd9ad04..e7c8e0a3f 100644
--- a/service/src/test/resources/transienttest/data/Enums.xml
+++ b/service/src/test/resources/transienttest/data/Enums.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="salutations" Name="Salutations" Type="Enumeration">
         <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
diff --git a/service/src/test/resources/transienttest/data/Orders.xml b/service/src/test/resources/transienttest/data/Orders.xml
index be9537285..8f3f6b071 100644
--- a/service/src/test/resources/transienttest/data/Orders.xml
+++ b/service/src/test/resources/transienttest/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/transienttest/data/Resources.xml b/service/src/test/resources/transienttest/data/Resources.xml
index c3bba8703..43182427d 100644
--- a/service/src/test/resources/transienttest/data/Resources.xml
+++ b/service/src/test/resources/transienttest/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/transienttest/data/StrolchModel.xml b/service/src/test/resources/transienttest/data/StrolchModel.xml
index 7596b8f0e..2597faace 100644
--- a/service/src/test/resources/transienttest/data/StrolchModel.xml
+++ b/service/src/test/resources/transienttest/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/service/src/test/resources/transienttest/data/example-model.xml b/service/src/test/resources/transienttest/data/example-model.xml
index f96d43173..55a423ef6 100644
--- a/service/src/test/resources/transienttest/data/example-model.xml
+++ b/service/src/test/resources/transienttest/data/example-model.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<StrolchModel xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd">
+<StrolchModel xmlns="https://strolch.li/schema/StrolchModel.xsd">
 
     <Resource Id="Product" Name="Product Template" Type="Template">
         <ParameterBag Id="parameters" Name="Parameters" Type="Parameters">
diff --git a/web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
index da846aef8..5788f3479 100644
--- a/web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
+++ b/web-rest/src/test/resources/withPrivilegeRuntime/data/Enums.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
 
     <Resource Id="salutation" Name="Salutations" Type="Enumeration">
         <ParameterBag Id="en" Name="Salutations" Type="Enumeration">
diff --git a/web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
index be9537285..8f3f6b071 100644
--- a/web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
+++ b/web-rest/src/test/resources/withPrivilegeRuntime/data/Orders.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="Created">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
index c3bba8703..43182427d 100644
--- a/web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
+++ b/web-rest/src/test/resources/withPrivilegeRuntime/data/Resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
diff --git a/web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml b/web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
index 905670c26..19505abdf 100644
--- a/web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
+++ b/web-rest/src/test/resources/withPrivilegeRuntime/data/StrolchModel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
-              xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
+<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://strolch.li/schema/StrolchModel.xsd"
+              xsi:schemaLocation="https://strolch.li/schema/StrolchModel.xsd https://strolch.li/xsd/StrolchModel-2.0.xsd">
     <Resource Id="TestType" Name="TestType Template" Type="Template">
         <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
             <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>