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"?> <?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"> elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation> <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:annotation>
<xs:element name="StrolchModel" type="StrolchModelType" /> <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="Id" use="required" />
<xs:attribute type="xs:string" name="Name" use="required" /> <xs:attribute type="xs:string" name="Name" use="required" />
<xs:attribute type="xs:string" name="Type" 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:attribute type="StateType" name="State" use="optional" />
</xs:complexType> </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"?> <?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"> <Order Id="@test1" Name="Test Order" Type="Order">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <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"?> <?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="Include1.xml" />
<IncludeFile file="Include2.xml" /> <IncludeFile file="Include2.xml" />
@ -56,7 +56,7 @@
</Policies> </Policies>
</Resource> </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" /> <Version Version="0" CreatedBy="test" CreatedAt="2012-11-30T18:12:05.628+01:00" Deleted="false" />
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <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:05.628+01:00" Value="5" Type="Integer" />
<ValueChange StateId="dummyId" Time="2012-11-30T18:12:06.628+01:00" Value="6" Type="Integer" /> <ValueChange StateId="dummyId" Time="2012-11-30T18:12:06.628+01:00" Value="6" Type="Integer" />
</Action> </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"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
</ParameterBag> </ParameterBag>

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

@ -1,120 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <Activity Id="activity_1" Name="Activity" Type="parentType" TimeOrdering="Series">
<Policies> <Policies>
<Policy Type="PlanningPolicy" Value="key:SimplePlanning" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Policies> </Policies>
<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"> <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
<Policies> <Policies>
<Policy Type="PlanningPolicy" Value="key:SimplePlanning" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Policies> </Policies>
<ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer" /> <ValueChange StateId="dummyId" Time="2012-11-30T18:12:05.628+01:00" Value="5" Type="Integer"/>
</Action> </Action>
<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series"> <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<Policies> <Policies>
<Policy Type="PlanningPolicy" Value="key:SimplePlanning" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Policies> </Policies>
<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use" /> <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"/>
<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" /> <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
</Activity> </Activity>
</Activity> </Activity>
<Activity Id="activity_2" Name="Activity" Type="parentType" TimeOrdering="Series"> <Activity Id="activity_2" Name="Activity" Type="parentType" TimeOrdering="Series">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"> <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series"> <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"> <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"> <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
</Activity> </Activity>
</Activity> </Activity>
<Activity Id="activity_3" Name="Activity" Type="parentType" TimeOrdering="Series"> <Activity Id="activity_3" Name="Activity" Type="parentType" TimeOrdering="Series">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"> <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series"> <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"> <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
<Activity Id="child_child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series"> <Activity Id="child_child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"> <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Action> </Action>
</Activity> </Activity>
</Activity> </Activity>
</Activity> </Activity>
</StrolchModel> </StrolchModel>

4
li.strolch.model/src/test/resources/data/activities/action.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Action Id="action_1" Name="Action 1" ResourceId="dummyRe" ResourceType="dummyReType" State="Created" Type="Use"> <Action Id="action_1" Name="Action 1" ResourceId="dummyRe" ResourceType="dummyReType" State="Created" Type="Use">
<ValueChange Class="li.strolch.model.timevalue.impl.IntegerValue" StateId="@state2" Time="1970-01-01T01:00:00.010+01:00" Value="1" /> <ValueChange Class="li.strolch.model.timevalue.impl.IntegerValue" StateId="@state2" Time="1970-01-01T01:00:00.010+01:00" Value="1"/>
<ValueChange Class="li.strolch.model.timevalue.impl.IntegerValue" StateId="@state2" Time="1970-01-01T01:00:00.030+01:00" Value="-1" /> <ValueChange Class="li.strolch.model.timevalue.impl.IntegerValue" StateId="@state2" Time="1970-01-01T01:00:00.030+01:00" Value="-1"/>
</Action> </Action>

10
li.strolch.model/src/test/resources/data/activities/activity.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Activity Id="activity" Name="Activity" Type="parentType" TimeOrdering="Series"> <Activity Id="activity" Name="Activity" Type="parentType" TimeOrdering="Series">
<Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" /> <Action Id="action_1" Name="Action 1" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
<Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series"> <Activity Id="child_activity" Name="Child Activity" Type="childType" TimeOrdering="Series">
<Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use" /> <Action Id="action_2" Name="Action 2" ResourceId="dummyId" ResourceType="dummyType" State="Planned" Type="Use"/>
<Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use" /> <Action Id="action_3" Name="Action 3" ResourceId="dummyId" ResourceType="dummyType" State="Created" Type="Use"/>
</Activity> </Activity>
</Activity> </Activity>

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

@ -1,22 +1,23 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?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" /> <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"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<Policies> <Policies>
<Policy Type="PlanningPolicy" Value="key:SimplePlanning" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Policies> </Policies>
</Order> </Order>
</StrolchModel> </StrolchModel>

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

@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?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"> <Order Id="Template" Name="MyTestOrder Template" Type="MyTestOrder">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
</Order> </Order>
</StrolchModel> </StrolchModel>

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

@ -1,48 +1,49 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?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" /> <IncludeFile file="Templates.xml"/>
<Resource Id="MyTestResource" Name="Test Name" Type="TestType"> <Resource Id="MyTestResource" Name="Test Name" Type="TestType">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D" /> <Parameter Id="@param8" Name="Duration Param" Type="Duration" Value="P1D"/>
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
</ParameterBag> </ParameterBag>
<TimedState Id="@booleanState" Name="Boolean State" Type="Boolean"> <TimedState Id="@booleanState" Name="Boolean State" Type="Boolean">
<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" /> <Value Time="1970-01-01T00:00:00.000+01:00" Value="false"/>
<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" /> <Value Time="1970-01-01T00:01:00.000+01:00" Value="true"/>
<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" /> <Value Time="1970-01-01T00:02:00.000+01:00" Value="false"/>
</TimedState> </TimedState>
<TimedState Id="@integerState" Name="Integer State" Type="Integer"> <TimedState Id="@integerState" Name="Integer State" Type="Integer">
<Value Time="1970-01-01T00:00:00.000+01:00" Value="1" /> <Value Time="1970-01-01T00:00:00.000+01:00" Value="1"/>
<Value Time="1970-01-01T00:01:00.000+01:00" Value="2" /> <Value Time="1970-01-01T00:01:00.000+01:00" Value="2"/>
<Value Time="1970-01-01T00:02:00.000+01:00" Value="3" /> <Value Time="1970-01-01T00:02:00.000+01:00" Value="3"/>
<Value Time="1970-01-01T00:03:00.000+01:00" Value="2" /> <Value Time="1970-01-01T00:03:00.000+01:00" Value="2"/>
<Value Time="1970-01-01T00:04:00.000+01:00" Value="1" /> <Value Time="1970-01-01T00:04:00.000+01:00" Value="1"/>
<Value Time="1970-01-01T00:05:00.000+01:00" Value="0" /> <Value Time="1970-01-01T00:05:00.000+01:00" Value="0"/>
</TimedState> </TimedState>
<TimedState Id="@floatState" Name="Float State" Type="Float"> <TimedState Id="@floatState" Name="Float State" Type="Float">
<Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1" /> <Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1"/>
<Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2" /> <Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2"/>
<Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3" /> <Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3"/>
<Value Time="1970-01-01T00:03:00.000+01:00" Value="2.2" /> <Value Time="1970-01-01T00:03:00.000+01:00" Value="2.2"/>
<Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1" /> <Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1"/>
<Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0" /> <Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0"/>
</TimedState> </TimedState>
<TimedState Id="@stringSetState" Name="StringSet State" Type="StringSet"> <TimedState Id="@stringSetState" Name="StringSet State" Type="StringSet">
<Value Time="1970-01-01T00:00:00.000+01:00" Value="foo" /> <Value Time="1970-01-01T00:00:00.000+01:00" Value="foo"/>
<Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar" /> <Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar"/>
<Value Time="1970-01-01T00:02:00.000+01:00" Value="bar" /> <Value Time="1970-01-01T00:02:00.000+01:00" Value="bar"/>
</TimedState> </TimedState>
<Policies> <Policies>
<Policy Type="PlanningPolicy" Value="key:SimplePlanning" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanning"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Policies> </Policies>
</Resource> </Resource>
</StrolchModel> </StrolchModel>

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

@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?> <?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"
<Resource Id="TestType" Name="TestType Template" Type="Template"> xsi:schemaLocation="https://strolch.li/xsd/StrolchModel-1.6.xsd StrolchModel-1.6.xsd">
<ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag"> <Resource Id="TestType" Name="TestType Template" Type="Template">
<Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World" /> <ParameterBag Id="@bag01" Name="Test Bag" Type="TestBag">
<Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00" /> <Parameter Id="@param7" Name="StringList Param" Type="StringList" Value="Hello;World"/>
<Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch" /> <Parameter Id="@param6" Name="Date Param" Type="Date" Value="2012-11-30T18:12:05.628+01:00"/>
<Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566" /> <Parameter Id="@param5" Name="String Param" Type="String" Value="Strolch"/>
<Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77" /> <Parameter Id="@param4" Name="Long Param" Type="Long" Value="4453234566"/>
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" /> <Parameter Id="@param3" Name="Integer Param" Type="Integer" Value="77"/>
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" /> <Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3"/>
</ParameterBag> <Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true"/>
<Policies> </ParameterBag>
<Policy Type="PlanningPolicy" Value="key:SimplePlanningPolicy" /> <Policies>
<Policy Type="ExecutionPolicy" Value="java:java.lang.Object" /> <Policy Type="PlanningPolicy" Value="key:SimplePlanningPolicy"/>
<Policy Type="ConfirmationPolicy" Value="key:NoConfirmation" /> <Policy Type="ExecutionPolicy" Value="java:java.lang.Object"/>
</Policies> <Policy Type="ConfirmationPolicy" Value="key:NoConfirmation"/>
</Resource> </Policies>
</Resource>
</StrolchModel> </StrolchModel>

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

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

7
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"?> <?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"> elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation> <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:annotation>
<xs:element name="StrolchModel" type="StrolchModelType" /> <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="Id" use="required" />
<xs:attribute type="xs:string" name="Name" use="required" /> <xs:attribute type="xs:string" name="Name" use="required" />
<xs:attribute type="xs:string" name="Type" 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:attribute type="StateType" name="State" use="optional" />
</xs:complexType> </xs:complexType>