Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project] Updated Strolch XSD

This commit is contained in:
Robert von Burg 2018-06-26 18:10:20 +02:00
parent 858bf76d65
commit dbbe581b54
12 changed files with 231 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
li.strolch.model/src/main/resources/StrolchModel-1.4.xsd → li.strolch.model/src/main/resources/StrolchModel-1.6.xsd
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.4.xsd" xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd"
<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"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This is Version 1.4.x of the StrolchModel XSD.</xs:documentation>
<xs:documentation>This is Version 1.6.x of the StrolchModel XSD.</xs:documentation>
</xs:annotation>
<xs:element name="StrolchModel" type="StrolchModelType" />
@ -39,6 +39,7 @@
<xs:attribute type="xs:string" name="Id" use="required" />
<xs:attribute type="xs:string" name="Name" use="required" />
<xs:attribute type="xs:string" name="Type" use="required" />
<xs:attribute type="xs:dateTime" name="Date" use="optional" />
<xs:attribute type="StateType" name="State" use="optional" />
</xs:complexType>

2
li.strolch.model/src/test/resources/data/StrolchModel.xml
View File

@ -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.4.xsd" xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd">
<StrolchModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="StrolchModel-1.6.xsd" xsi:schemaLocation="StrolchModel-1.6.xsd">
<Order Id="@test1" Name="Test Order" Type="Order">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">

6
li.strolch.model/src/test/resources/data/StrolchModelAll.xml
View File

@ -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.4.xsd" xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.4.xsd StrolchModel-1.4.xsd">
<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">
<IncludeFile file="Include1.xml" />
<IncludeFile file="Include2.xml" />
@ -56,7 +56,7 @@
</Policies>
</Resource>
<Activity Id="activity_1" Name="Activity" Type="parentType">
<Activity Id="activity_1" Name="Activity" Type="parentType" TimeOrdering="Series">
<Version Version="0" CreatedBy="test" CreatedAt="2012-11-30T18:12:05.628+01:00" Deleted="false" />
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
@ -76,7 +76,7 @@
<ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer" />
<ValueChange StateId="dummyId" Time="2012-11-30T18:12:06.628+01:00" Value="6" Type="Integer" />
</Action>
<Activity Id="child_activity" Name="Child Activity" Type="childType">
<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
</ParameterBag>

3
li.strolch.model/src/test/resources/data/activities/Activities.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<StrolchModel>
<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">
<Activity Id="activity_1" Name="Activity" Type="parentType" TimeOrdering="Series">
<Policies>

5
li.strolch.model/src/test/resources/data/orders/Orders.xml
View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<StrolchModel>
<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">
<IncludeFile file="Templates.xml"/>
<Order Id="MyTestOrder" Name="Test Name" Type="TestType" Date="2013-11-20T07:42:57.699+01:00" State="CREATED">
<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="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>

3
li.strolch.model/src/test/resources/data/orders/Templates.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<StrolchModel>
<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">
<Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">

3
li.strolch.model/src/test/resources/data/resources/Resources.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<StrolchModel>
<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">
<IncludeFile file="Templates.xml"/>

3
li.strolch.model/src/test/resources/data/resources/Templates.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<StrolchModel>
<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">
<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"/>

6
li.strolch.website/www.strolch.li/documentation-model.html
View File

@ -53,14 +53,14 @@
<div class="content">
<p>There is a XML Schema which defines the model in XML: <a
href="xsd/StrolchModel-1.4.xsd">StrolchModel-1.4.xsd</a>
href="xsd/StrolchModel-1.6.xsd">StrolchModel-1.6.xsd</a>
</p>
Here is an example of all the possible elements in Strolch:
<pre>
&lt;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"&gt;
xmlns="https://strolch.li/xsd/StrolchModel-1.6.xsd"
xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd"&gt;
&lt;IncludeFile file="Include1.xml"/&gt;

5
li.strolch.website/www.strolch.li/xsd/StrolchModel-1.4.xsd → li.strolch.website/www.strolch.li/xsd/StrolchModel-1.6.xsd
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="https://strolch.li/xsd/StrolchModel-1.4.xsd" xmlns="https://strolch.li/xsd/StrolchModel-1.4.xsd"
<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"
elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This is Version 1.4.x of the StrolchModel XSD.</xs:documentation>
<xs:documentation>This is Version 1.6.x of the StrolchModel XSD.</xs:documentation>
</xs:annotation>
<xs:element name="StrolchModel" type="StrolchModelType" />
@ -39,6 +39,7 @@
<xs:attribute type="xs:string" name="Id" use="required" />
<xs:attribute type="xs:string" name="Name" use="required" />
<xs:attribute type="xs:string" name="Type" use="required" />
<xs:attribute type="xs:dateTime" name="Date" use="optional" />
<xs:attribute type="StateType" name="State" use="optional" />
</xs:complexType>