From dbbe581b5481bedddf4415be78ed002115d594f7 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 26 Jun 2018 18:10:20 +0200 Subject: [PATCH] [Project] Updated Strolch XSD --- ...olchModel-1.4.xsd => StrolchModel-1.6.xsd} | 5 +- .../src/test/resources/data/StrolchModel.xml | 2 +- .../test/resources/data/StrolchModelAll.xml | 6 +- .../resources/data/activities/Activities.xml | 229 +++++++++--------- .../test/resources/data/activities/action.xml | 4 +- .../resources/data/activities/activity.xml | 10 +- .../src/test/resources/data/orders/Orders.xml | 37 +-- .../test/resources/data/orders/Templates.xml | 25 +- .../resources/data/resources/Resources.xml | 89 +++---- .../resources/data/resources/Templates.xml | 35 +-- .../www.strolch.li/documentation-model.html | 6 +- ...olchModel-1.4.xsd => StrolchModel-1.6.xsd} | 7 +- 12 files changed, 231 insertions(+), 224 deletions(-) rename li.strolch.model/src/main/resources/{StrolchModel-1.4.xsd => StrolchModel-1.6.xsd} (97%) rename li.strolch.website/www.strolch.li/xsd/{StrolchModel-1.4.xsd => StrolchModel-1.6.xsd} (96%) diff --git a/li.strolch.model/src/main/resources/StrolchModel-1.4.xsd b/li.strolch.model/src/main/resources/StrolchModel-1.6.xsd similarity index 97% rename from li.strolch.model/src/main/resources/StrolchModel-1.4.xsd rename to li.strolch.model/src/main/resources/StrolchModel-1.6.xsd index c398f6325..1b6d848f2 100644 --- a/li.strolch.model/src/main/resources/StrolchModel-1.4.xsd +++ b/li.strolch.model/src/main/resources/StrolchModel-1.6.xsd @@ -1,9 +1,9 @@ - - This is Version 1.4.x of the StrolchModel XSD. + This is Version 1.6.x of the StrolchModel XSD. @@ -39,6 +39,7 @@ + diff --git a/li.strolch.model/src/test/resources/data/StrolchModel.xml b/li.strolch.model/src/test/resources/data/StrolchModel.xml index bcbaf99f7..d7c98fe1e 100644 --- a/li.strolch.model/src/test/resources/data/StrolchModel.xml +++ b/li.strolch.model/src/test/resources/data/StrolchModel.xml @@ -1,5 +1,5 @@ - + diff --git a/li.strolch.model/src/test/resources/data/StrolchModelAll.xml b/li.strolch.model/src/test/resources/data/StrolchModelAll.xml index df8da3235..00fb460b9 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 @@ - + @@ -56,7 +56,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/li.strolch.model/src/test/resources/data/activities/Activities.xml b/li.strolch.model/src/test/resources/data/activities/Activities.xml index f369515e0..40415a3fe 100644 --- a/li.strolch.model/src/test/resources/data/activities/Activities.xml +++ b/li.strolch.model/src/test/resources/data/activities/Activities.xml @@ -1,120 +1,121 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/li.strolch.model/src/test/resources/data/activities/action.xml b/li.strolch.model/src/test/resources/data/activities/action.xml index c6422dd97..3e04d4f57 100644 --- a/li.strolch.model/src/test/resources/data/activities/action.xml +++ b/li.strolch.model/src/test/resources/data/activities/action.xml @@ -1,5 +1,5 @@ - - + + diff --git a/li.strolch.model/src/test/resources/data/activities/activity.xml b/li.strolch.model/src/test/resources/data/activities/activity.xml index 952adf28c..71c298e65 100644 --- a/li.strolch.model/src/test/resources/data/activities/activity.xml +++ b/li.strolch.model/src/test/resources/data/activities/activity.xml @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/li.strolch.model/src/test/resources/data/orders/Orders.xml b/li.strolch.model/src/test/resources/data/orders/Orders.xml index 6e5041ef7..972bdf3b1 100644 --- a/li.strolch.model/src/test/resources/data/orders/Orders.xml +++ b/li.strolch.model/src/test/resources/data/orders/Orders.xml @@ -1,22 +1,23 @@ - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/li.strolch.model/src/test/resources/data/orders/Templates.xml b/li.strolch.model/src/test/resources/data/orders/Templates.xml index bd86a6925..006c3b58c 100644 --- a/li.strolch.model/src/test/resources/data/orders/Templates.xml +++ b/li.strolch.model/src/test/resources/data/orders/Templates.xml @@ -1,15 +1,16 @@ - + - - - - - - - - - - - + + + + + + + + + + + diff --git a/li.strolch.model/src/test/resources/data/resources/Resources.xml b/li.strolch.model/src/test/resources/data/resources/Resources.xml index e5bfb303e..769620176 100644 --- a/li.strolch.model/src/test/resources/data/resources/Resources.xml +++ b/li.strolch.model/src/test/resources/data/resources/Resources.xml @@ -1,48 +1,49 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/li.strolch.model/src/test/resources/data/resources/Templates.xml b/li.strolch.model/src/test/resources/data/resources/Templates.xml index 93611adbe..10690ad67 100644 --- a/li.strolch.model/src/test/resources/data/resources/Templates.xml +++ b/li.strolch.model/src/test/resources/data/resources/Templates.xml @@ -1,19 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/li.strolch.website/www.strolch.li/documentation-model.html b/li.strolch.website/www.strolch.li/documentation-model.html index 635c1603e..ee46a54f1 100644 --- a/li.strolch.website/www.strolch.li/documentation-model.html +++ b/li.strolch.website/www.strolch.li/documentation-model.html @@ -53,14 +53,14 @@

There is a XML Schema which defines the model in XML: StrolchModel-1.4.xsd + href="xsd/StrolchModel-1.6.xsd">StrolchModel-1.6.xsd

Here is an example of all the possible elements in Strolch: 
 <StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd"
-            xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd">
+            xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
+            xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
 
   <IncludeFile file="Include1.xml"/>
 
diff --git a/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd b/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.6.xsd
similarity index 96%
rename from li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd
rename to li.strolch.website/www.strolch.li/xsd/StrolchModel-1.6.xsd
index c398f6325..0508d1b56 100644
--- a/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd
+++ b/li.strolch.website/www.strolch.li/xsd/StrolchModel-1.6.xsd
@@ -1,9 +1,9 @@
 
-
+
 
 	
-		This is Version 1.4.x of the StrolchModel XSD.
+		This is Version 1.6.x of the StrolchModel XSD.
 	
 
 	
@@ -39,6 +39,7 @@
 		
 		
 		
+