diff options
Diffstat (limited to 'src/main/resources')
20 files changed, 264 insertions, 80 deletions
diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml index 9eb8bf0..f1def44 100644 --- a/src/main/resources/boot/CA/ManageCompositeActDef.xml +++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml @@ -11,8 +11,7 @@ <OutEdgeId>20</OutEdgeId>
<OutEdgeId>21</OutEdgeId>
<Properties>
- <KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
+ <KeyValuePair Key="LastNum" String="2"/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
@@ -37,10 +36,7 @@ <OutlinePoint x="244" y="51"/>
<OutEdgeId>16</OutEdgeId>
<OutEdgeId>17</OutEdgeId>
- <Properties>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
- <KeyValuePair Key="RoutingScriptName" String=""/>
- </Properties>
+ <Properties/>
</AndSplitDef>
<JoinDef ID="4" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
<CentrePoint x="265" y="473"/>
@@ -65,7 +61,6 @@ <OutEdgeId>8</OutEdgeId>
<Properties>
<KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
@@ -78,8 +73,6 @@ <InEdgeId>18</InEdgeId>
<OutEdgeId>19</OutEdgeId>
<Properties>
- <KeyValuePair Key="Prefill" Boolean="false"/>
- <KeyValuePair Key="Prefill Version" String="-1"/>
<KeyValuePair Key="ViewName" String="CompositeActivityDef"/>
<KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
</Properties>
@@ -107,8 +100,6 @@ <InEdgeId>24</InEdgeId>
<OutEdgeId>25</OutEdgeId>
<Properties>
- <KeyValuePair Key="Prefill" Boolean="false"/>
- <KeyValuePair Key="Prefill Version" String="-1"/>
<KeyValuePair Key="Name" String="EditDefinition"/>
<KeyValuePair Key="SchemaType" String="CompositeActivityDef"/>
</Properties>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml index 77baa8e..756fb8a 100644 --- a/src/main/resources/boot/CA/ManageElementaryActDef.xml +++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml @@ -12,7 +12,6 @@ <OutEdgeId>21</OutEdgeId>
<Properties>
<KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
@@ -49,10 +48,7 @@ <OutlinePoint x="244" y="51"/>
<OutEdgeId>16</OutEdgeId>
<OutEdgeId>17</OutEdgeId>
- <Properties>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
- <KeyValuePair Key="RoutingScriptName" String=""/>
- </Properties>
+ <Properties/>
</AndSplitDef>
<LoopDef ID="3" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
<CentrePoint x="177" y="359"/>
@@ -65,7 +61,6 @@ <OutEdgeId>8</OutEdgeId>
<Properties>
<KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
diff --git a/src/main/resources/boot/CA/ModuleWorkflow.xml b/src/main/resources/boot/CA/ModuleWorkflow.xml index 20ce685..1eb3ee4 100644 --- a/src/main/resources/boot/CA/ModuleWorkflow.xml +++ b/src/main/resources/boot/CA/ModuleWorkflow.xml @@ -49,7 +49,7 @@ <OutEdgeId>4</OutEdgeId>
<Properties>
<KeyValuePair Key="Name" String="EditModuleDefinition"/>
- <KeyValuePair Key="Version" String="0"/>
+ <KeyValuePair Key="Version" Integer="0"/>
</Properties>
<activityDef>EditModuleDefinition</activityDef>
</ActivitySlotDef>
diff --git a/src/main/resources/boot/CA/ServerItemWorkflow.xml b/src/main/resources/boot/CA/ServerItemWorkflow.xml index 085f8ab..b27b3cb 100644 --- a/src/main/resources/boot/CA/ServerItemWorkflow.xml +++ b/src/main/resources/boot/CA/ServerItemWorkflow.xml @@ -24,7 +24,6 @@ <OutEdgeId>19</OutEdgeId>
<Properties>
<KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
@@ -39,7 +38,6 @@ <OutEdgeId>18</OutEdgeId>
<Properties>
<KeyValuePair Key="LastNum" String="2"/>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String="javascript:true;"/>
</Properties>
</LoopDef>
@@ -78,7 +76,6 @@ <OutEdgeId>10</OutEdgeId>
<OutEdgeId>11</OutEdgeId>
<Properties>
- <KeyValuePair Key="RoutingScriptVersion" String=""/>
<KeyValuePair Key="RoutingScriptName" String=""/>
</Properties>
</AndSplitDef>
@@ -94,6 +91,7 @@ <KeyValuePair Key="Prefill" Boolean="false"/>
<KeyValuePair Key="Prefill Version" String="-1"/>
<KeyValuePair Key="Name" String="CreateNewAgent"/>
+ <KeyValuePair Key="Version" Integer="0"/>
</Properties>
<activityDef>CreateNewAgent</activityDef>
</ActivitySlotDef>
@@ -109,6 +107,7 @@ <KeyValuePair Key="Prefill" Boolean="false"/>
<KeyValuePair Key="Prefill Version" String="-1"/>
<KeyValuePair Key="Name" String="CreateNewItem"/>
+ <KeyValuePair Key="Version" Integer="0"/>
</Properties>
<activityDef>CreateNewItem</activityDef>
</ActivitySlotDef>
diff --git a/src/main/resources/boot/OD/CompositeActivityDef.xsd b/src/main/resources/boot/OD/CompositeActivityDef.xsd index 0b94df1..2e041cd 100644 --- a/src/main/resources/boot/OD/CompositeActivityDef.xsd +++ b/src/main/resources/boot/OD/CompositeActivityDef.xsd @@ -25,7 +25,7 @@ <xs:element ref="Properties"/>
<xs:element name="activityDef" type="xs:string"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
<xs:attribute name="Height" type="xs:integer" use="required"/>
<xs:attribute name="Width" type="xs:integer" use="required"/>
@@ -42,10 +42,10 @@ <xs:element ref="OutEdgeId" minOccurs="0"/>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
- <xs:attribute name="Height" type="xs:byte" use="required"/>
- <xs:attribute name="Width" type="xs:byte" use="required"/>
+ <xs:attribute name="Height" type="xs:integer" use="required"/>
+ <xs:attribute name="Width" type="xs:integer" use="required"/>
<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
</xs:complexType>
@@ -59,10 +59,10 @@ <xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
- <xs:attribute name="Height" type="xs:byte" use="required"/>
- <xs:attribute name="Width" type="xs:byte" use="required"/>
+ <xs:attribute name="Height" type="xs:integer" use="required"/>
+ <xs:attribute name="Width" type="xs:integer" use="required"/>
<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
<xs:attribute name="isNext" type="xs:boolean" use="required"/>
@@ -85,9 +85,9 @@ </xs:element>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
- <xs:attribute name="OriginVertexId" type="xs:byte" use="required"/>
- <xs:attribute name="TerminusVertexId" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
+ <xs:attribute name="OriginVertexId" type="xs:integer" use="required"/>
+ <xs:attribute name="TerminusVertexId" type="xs:integer" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="XOrSplitDef">
@@ -99,10 +99,10 @@ <xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
- <xs:attribute name="Height" type="xs:byte" use="required"/>
- <xs:attribute name="Width" type="xs:byte" use="required"/>
+ <xs:attribute name="Height" type="xs:integer" use="required"/>
+ <xs:attribute name="Width" type="xs:integer" use="required"/>
<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
</xs:complexType>
@@ -116,10 +116,10 @@ <xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
- <xs:attribute name="Height" type="xs:byte" use="required"/>
- <xs:attribute name="Width" type="xs:byte" use="required"/>
+ <xs:attribute name="Height" type="xs:integer" use="required"/>
+ <xs:attribute name="Width" type="xs:integer" use="required"/>
<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
</xs:complexType>
@@ -133,18 +133,18 @@ <xs:element ref="OutEdgeId" maxOccurs="unbounded"/>
<xs:element ref="Properties"/>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
- <xs:attribute name="Height" type="xs:byte" use="required"/>
- <xs:attribute name="Width" type="xs:byte" use="required"/>
+ <xs:attribute name="Height" type="xs:integer" use="required"/>
+ <xs:attribute name="Width" type="xs:integer" use="required"/>
<xs:attribute name="IsLayoutable" type="xs:boolean" use="required"/>
<xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
</xs:complexType>
</xs:element>
</xs:choice>
<xs:attribute name="ClassNameOfVertexOutlineCreator" type="xs:string" use="optional"/>
- <xs:attribute name="StartVertexId" type="xs:byte" use="required"/>
- <xs:attribute name="NextId" type="xs:byte" use="required"/>
+ <xs:attribute name="StartVertexId" type="xs:integer" use="required"/>
+ <xs:attribute name="NextId" type="xs:integer" use="required"/>
</xs:complexType>
</xs:element>
</xs:sequence>
@@ -161,8 +161,8 @@ <xs:attribute name="IsComposite" type="xs:boolean" use="required"/>
</xs:complexType>
</xs:element>
- <xs:element name="InEdgeId" type="xs:byte"/>
- <xs:element name="OutEdgeId" type="xs:byte"/>
+ <xs:element name="InEdgeId" type="xs:integer"/>
+ <xs:element name="OutEdgeId" type="xs:integer"/>
<xs:element name="OutlinePoint">
<xs:complexType>
<xs:attribute name="x" type="xs:short" use="required"/>
diff --git a/src/main/resources/boot/OD/ElementaryActivityDef.xsd b/src/main/resources/boot/OD/ElementaryActivityDef.xsd index 496ac90..ebe52a0 100644 --- a/src/main/resources/boot/OD/ElementaryActivityDef.xsd +++ b/src/main/resources/boot/OD/ElementaryActivityDef.xsd @@ -19,7 +19,7 @@ </xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="ID" type="xs:byte" use="required"/>
+ <xs:attribute name="ID" type="xs:integer" use="required"/>
<xs:attribute name="Name" type="xs:string" use="required"/>
<xs:attribute name="Height" type="xs:integer" use="optional"/>
<xs:attribute name="Width" type="xs:integer" use="optional"/>
diff --git a/src/main/resources/boot/OD/StateMachine.xsd b/src/main/resources/boot/OD/StateMachine.xsd new file mode 100644 index 0000000..a7f8c04 --- /dev/null +++ b/src/main/resources/boot/OD/StateMachine.xsd @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <xs:element name="StateMachine">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="State" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="id" type="xs:int" use="required" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="proceeds" type="xs:boolean" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Transition" maxOccurs="unbounded" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Outcome" maxOccurs="1" minOccurs="0">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="version" type="xs:string" use="required" />
+ <xs:attribute name="required" type="xs:boolean" use="optional" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Script" maxOccurs="1" minOccurs="0">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="version" type="xs:string" use="required" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:int" use="required" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="origin" type="xs:int" use="required" />
+ <xs:attribute name="target" type="xs:int" use="required" />
+ <xs:attribute name="enablingProperty" type="xs:string" />
+ <xs:attribute name="roleOverride" type="xs:string" />
+ <xs:attribute name="reservation">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="set" />
+ <xs:enumeration value="clear" />
+ <xs:enumeration value="preserve" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="initialState" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
+
+
diff --git a/src/main/resources/boot/SM/CompositeActivity.xml b/src/main/resources/boot/SM/CompositeActivity.xml new file mode 100644 index 0000000..2ed5c4d --- /dev/null +++ b/src/main/resources/boot/SM/CompositeActivity.xml @@ -0,0 +1,11 @@ +<StateMachine initialState="0">
+ <State id="0" name="Waiting"/>
+ <State id="1" name="Started"/>
+ <State id="2" name="Finished" proceeds="true"/>
+
+ <Transition id="0" name="Start" origin="0" target="1"/>
+ <Transition id="1" name="Complete" origin="1" target="2"/>
+</StateMachine>
+
+
+
diff --git a/src/main/resources/boot/SM/Default.xml b/src/main/resources/boot/SM/Default.xml new file mode 100644 index 0000000..893bfe8 --- /dev/null +++ b/src/main/resources/boot/SM/Default.xml @@ -0,0 +1,23 @@ +<StateMachine initialState="0">
+ <State id="0" name="Waiting"/>
+ <State id="1" name="Started"/>
+ <State id="2" name="Finished" proceeds="true"/>
+ <State id="3" name="Suspended"/>
+
+ <Transition id="0" name="Done" origin="0" target="2">
+ <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
+ <Script name="${ScriptName}" version="${ScriptVersion}"/>
+ </Transition>
+ <Transition id="1" name="Start" origin="0" target="1" reservation="set"/>
+ <Transition id="2" name="Complete" origin="1" target="2" reservation="clear">
+ <Outcome name="${SchemaType}" version="${SchemaVersion}"/>
+ <Script name="${ScriptName}" version="${ScriptVersion}"/>
+ </Transition>
+ <Transition id="3" name="Suspend" origin="1" target="3">
+ <Outcome name="Errors" version="0"/>
+ </Transition>
+ <Transition id="4" name="Resume" origin="3" target="1" roleOverride="Admin" reservation="preserve"/>
+</StateMachine>
+
+
+
diff --git a/src/main/resources/boot/SM/PredefinedStep.xml b/src/main/resources/boot/SM/PredefinedStep.xml new file mode 100644 index 0000000..f62fd09 --- /dev/null +++ b/src/main/resources/boot/SM/PredefinedStep.xml @@ -0,0 +1,9 @@ +<StateMachine initialState="0">
+ <State id="0" name="Available"/>
+ <Transition id="0" name="Done" origin="0" target="0">
+ <Outcome name="PredefinedStepOutcome" version="0"/>
+ </Transition>
+</StateMachine>
+
+
+
diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt index 8c6e052..194eb61 100644 --- a/src/main/resources/boot/allbootitems.txt +++ b/src/main/resources/boot/allbootitems.txt @@ -1,3 +1,6 @@ +SM/Default
+SM/PredefinedStep
+SM/CompositeActivity
OD/CompositeActivityDef
OD/ElementaryActivityDef
OD/Module
@@ -8,6 +11,7 @@ OD/PropertyDescription OD/Schema
OD/Script
OD/Errors
+OD/StateMachine
EA/AssignNewVersionFromLast
EA/EditActivityDef
EA/EditSchema
diff --git a/src/main/resources/boot/property/SMProp.xml b/src/main/resources/boot/property/SMProp.xml new file mode 100644 index 0000000..8581e74 --- /dev/null +++ b/src/main/resources/boot/property/SMProp.xml @@ -0,0 +1,5 @@ +<AllProperties>
+ <PropertyDescription Name="Name" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
+ <PropertyDescription Name="Type" IsClassIdentifier="true" DefaultValue="StateMachine" IsMutable="false"/>
+ <PropertyDescription Name="Module" IsClassIdentifier="false" DefaultValue="" IsMutable="false"/>
+</AllProperties>
diff --git a/src/main/resources/mapFiles/CollectionMap.xml b/src/main/resources/mapFiles/CollectionMap.xml index e9a7d7a..804022b 100644 --- a/src/main/resources/mapFiles/CollectionMap.xml +++ b/src/main/resources/mapFiles/CollectionMap.xml @@ -112,4 +112,13 @@ <class name="com.c2kernel.collection.AggregationInstance" extends="com.c2kernel.collection.Aggregation">
<map-to xml="AggregationInstance"/>
</class>
+ <class name="com.c2kernel.collection.CollectionArrayList">
+ <map-to xml="CollectionList"/>
+ <field name="list"
+ collection="arraylist"
+ direct="true"
+ type="com.c2kernel.collection.Collection">
+ <bind-xml auto-naming="deriveByClass" node="element"/>
+ </field>
+ </class>
</mapping>
diff --git a/src/main/resources/mapFiles/HistoryMap.xml b/src/main/resources/mapFiles/HistoryMap.xml index 85a2afa..ced8483 100644 --- a/src/main/resources/mapFiles/HistoryMap.xml +++ b/src/main/resources/mapFiles/HistoryMap.xml @@ -24,12 +24,21 @@ <field name="mSchemaVersion" type="integer" direct="false" get-method="getSchemaVersion" set-method="setSchemaVersion">
<bind-xml name="SchemaVersion" node="attribute"/>
</field>
+ <field name="mStateMachineName" type="string" direct="false" get-method="getStateMachineName" set-method="setStateMachineName">
+ <bind-xml name="StateMachineName" node="attribute"/>
+ </field>
+ <field name="mStateMachineVersion" type="integer" direct="false" get-method="getStateMachineVersion" set-method="setStateMachineVersion">
+ <bind-xml name="StateMachineVersion" node="attribute"/>
+ </field>
<field name="mViewName" type="string" direct="false" get-method="getViewName" set-method="setViewName">
<bind-xml name="ViewName" node="attribute"/>
</field>
- <field name="mCurrentState" type="integer" direct="false" get-method="getCurrentState" set-method="setCurrentState">
- <bind-xml name="CurrentState" node="attribute"/>
+ <field name="mOriginState" type="integer" direct="false" get-method="getOriginState" set-method="setOriginState">
+ <bind-xml name="OriginState" node="attribute"/>
</field>
+ <field name="mTargetState" type="integer" direct="false" get-method="getTargetState" set-method="setTargetState">
+ <bind-xml name="TargetState" node="attribute"/>
+ </field>
<field name="mTransition" type="integer" direct="false" get-method="getTransition" set-method="setTransition">
<bind-xml name="Transition" node="attribute"/>
</field>
@@ -37,7 +46,7 @@ <field name="mAgentName" type="string" direct="false"
get-method="getAgentName"
set-method="setAgentName">
- <bind-xml name="AgentId" node="attribute"/>
+ <bind-xml name="AgentName" node="attribute"/>
</field>
<field name="mAgentRole" type="string" direct="false"
get-method="getAgentRole"
diff --git a/src/main/resources/mapFiles/JobListMap.xml b/src/main/resources/mapFiles/JobListMap.xml index 7352248..d09f7cc 100644 --- a/src/main/resources/mapFiles/JobListMap.xml +++ b/src/main/resources/mapFiles/JobListMap.xml @@ -2,40 +2,37 @@ <mapping>
<class name="com.c2kernel.entity.agent.Job">
<map-to xml="Job"/>
- <field name="mItemSysKey" type="integer" direct="false" get-method="getItemSysKey" set-method="setItemSysKey">
+ <field name="id" type="integer" direct="false" get-method="getId" set-method="setId">
+ <bind-xml name="Id" node="attribute"/>
+ </field>
+ <field name="itemSysKey" type="integer" direct="false" get-method="getItemSysKey" set-method="setItemSysKey">
<bind-xml name="ItemSysKey" node="attribute"/>
</field>
- <field name="mID" type="integer" direct="false" get-method="getID" set-method="setID">
- <bind-xml name="ID" node="attribute"/>
+ <field name="stepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">
+ <bind-xml name="StepName" node="attribute"/>
+ </field>
+ <field name="stepType" type="string" direct="false" get-method="getStepType" set-method="setStepType">
+ <bind-xml name="StepType" node="attribute"/>
</field>
- <field name="mStepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
+ <field name="stepPath" type="string" direct="false" get-method="getStepPath" set-method="setStepPath">
<bind-xml name="StepPath" node="attribute"/>
</field>
- <field name="mPossibleTransition" type="integer" direct="false" get-method="getPossibleTransition" set-method="setPossibleTransition">
- <bind-xml name="PossibleTransition" node="attribute"/>
- </field>
- <field name="mCurrentState" type="integer" direct="false" get-method="getCurrentState" set-method="setCurrentState">
- <bind-xml name="CurrentState" node="attribute"/>
- </field>
- <field name="mTargetState" type="integer" direct="false" get-method="getTargetState" set-method="setTargetState">
- <bind-xml name="TargetState" node="attribute"/>
+ <field name="transition" type="com.c2kernel.lifecycle.instance.stateMachine.Transition" direct="false" get-method="getTransition" set-method="setTransition">
+ <bind-xml name="Transition" node="element"/>
</field>
- <field name="mStepName" type="string" direct="false" get-method="getStepName" set-method="setStepName">
- <bind-xml name="StepName" node="attribute"/>
+ <field name="agentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
+ <bind-xml name="AgentName" node="attribute"/>
</field>
- <field name="mAgentId" type="integer" direct="false" get-method="getAgentId" set-method="setAgentId">
- <bind-xml name="AgentId" node="attribute"/>
+ <field name="originStateName" type="string" direct="false" get-method="getOriginStateName" set-method="setOriginStateName">
+ <bind-xml name="OriginState" node="attribute"/>
</field>
- <field name="mAgentName" type="string" direct="false" get-method="getAgentName" set-method="setAgentName">
- <bind-xml name="AgentName" node="attribute"/>
+ <field name="targetStateName" type="string" direct="false" get-method="getTargetStateName" set-method="setTargetStateName">
+ <bind-xml name="TargetState" node="attribute"/>
</field>
- <field name="mAgentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
+ <field name="agentRole" type="string" direct="false" get-method="getAgentRole" set-method="setAgentRole">
<bind-xml name="AgentRole" node="attribute"/>
</field>
- <field name="mStepType" type="string" direct="false" get-method="getStepType" set-method="setStepType">
- <bind-xml name="StepType" node="attribute"/>
- </field>
- <field name="mActProps" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+ <field name="actProps" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false" get-method="getKeyValuePairs" set-method="setKeyValuePairs">
<bind-xml name="ActProps" node="element"/>
</field>
</class>
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml index f003a32..472fe84 100644 --- a/src/main/resources/mapFiles/LifeCycleMap.xml +++ b/src/main/resources/mapFiles/LifeCycleMap.xml @@ -57,11 +57,8 @@ <field name="eventIds" type="string" transient="true">
<bind-xml name="eventIds" node="element"/>
</field>
- <field name="startDate" type="com.c2kernel.common.GTimeStamp" direct="false">
- <bind-xml name="startDate" node="element"/>
- </field>
- <field name="activeDate" type="com.c2kernel.common.GTimeStamp" direct="false">
- <bind-xml name="activeDate" node="element"/>
+ <field name="stateDate" type="com.c2kernel.common.GTimeStamp" direct="false">
+ <bind-xml name="stateDate" node="element"/>
</field>
</class>
<class name="com.c2kernel.lifecycle.instance.CompositeActivity" extends="com.c2kernel.lifecycle.instance.Activity">
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml index 541b393..45f6cbe 100644 --- a/src/main/resources/mapFiles/ModuleMap.xml +++ b/src/main/resources/mapFiles/ModuleMap.xml @@ -17,12 +17,12 @@ <field name="imports" direct="true" type="com.c2kernel.process.module.ModuleImports">
<bind-xml name="Imports" node="element" />
</field>
- <field name="config" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleConfig">
+ <field name="config" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleConfig">
<bind-xml name="Config" node="element" />
</field>
- <field name="scripts" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleScript">
+ <field name="scripts" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleScript">
<bind-xml name="Script" node="element" />
- </field>
+ </field>
</class>
<class name="com.c2kernel.process.module.ModuleImports">
<map-to xml="Imports"/>
diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml index dcbab09..239fa21 100644 --- a/src/main/resources/mapFiles/NewEntityMap.xml +++ b/src/main/resources/mapFiles/NewEntityMap.xml @@ -95,7 +95,6 @@ </field>
</class>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">
- <map-to xml="Outcome"/>
<field name="viewname" type="string" direct="true">
<bind-xml name="viewname" node="attribute"/>
</field>
diff --git a/src/main/resources/mapFiles/StateMachineMap.xml b/src/main/resources/mapFiles/StateMachineMap.xml new file mode 100644 index 0000000..023dfb4 --- /dev/null +++ b/src/main/resources/mapFiles/StateMachineMap.xml @@ -0,0 +1,81 @@ +<?xml version="1.0"?>
+<mapping>
+ <class name="com.c2kernel.lifecycle.instance.stateMachine.StateMachine">
+ <map-to xml="StateMachine" />
+ <field name="states" type="com.c2kernel.lifecycle.instance.stateMachine.State"
+ collection="arraylist" direct="false" get-method="getStates" set-method="setStates">
+ <bind-xml name="State" node="element" />
+ </field>
+ <field name="transitions"
+ type="com.c2kernel.lifecycle.instance.stateMachine.Transition"
+ collection="arraylist" direct="false">
+ <bind-xml name="Transition" node="element" />
+ </field>
+ <field name="initialStateCode" type="integer">
+ <bind-xml name="initialState" node="attribute" />
+ </field>
+ </class>
+ <class name="com.c2kernel.lifecycle.instance.stateMachine.State">
+ <map-to xml="State"/>
+ <field name="id" type="integer" direct="false">
+ <bind-xml name="id" node="attribute" />
+ </field>
+ <field name="name" type="string" direct="false">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="finished" type="boolean" direct="false">
+ <bind-xml name="proceeds" node="attribute" />
+ </field>
+ </class>
+ <class name="com.c2kernel.lifecycle.instance.stateMachine.Transition">
+ <map-to xml="Transition"/>
+ <field name="id" type="integer" direct="false">
+ <bind-xml name="id" node="attribute" />
+ </field>
+ <field name="name" type="string" direct="false">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="originStateId" type="integer" direct="false">
+ <bind-xml name="origin" node="attribute" />
+ </field>
+ <field name="targetStateId" type="integer" direct="false">
+ <bind-xml name="target" node="attribute" />
+ </field>
+ <field name="enabledProp" type="string" direct="false">
+ <bind-xml name="enablingProperty" node="attribute" />
+ </field>
+ <field name="roleOverride" type="string" direct="false">
+ <bind-xml name="roleOverride" node="attribute" />
+ </field>
+ <field name="reservation" type="string" direct="false">
+ <bind-xml name="reservation" node="attribute" />
+ </field>
+ <field name="outcome" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome" direct="false">
+ <bind-xml name="Outcome" node="element" />
+ </field>
+ <field name="script" type="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript" direct="false">
+ <bind-xml name="Script" node="element" />
+ </field>
+ </class>
+ <class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionOutcome">
+ <map-to xml="Outcome"/>
+ <field name="schemaName" type="string" direct="false">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="schemaVersion" type="string" direct="false">
+ <bind-xml name="version" node="attribute" />
+ </field>
+ <field name="required" type="boolean" direct="false">
+ <bind-xml name="required" node="attribute" />
+ </field>
+ </class>
+ <class name="com.c2kernel.lifecycle.instance.stateMachine.TransitionScript">
+ <map-to xml="Script"/>
+ <field name="scriptName" type="string" direct="false">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="scriptVersion" type="string" direct="false">
+ <bind-xml name="version" node="attribute" />
+ </field>
+ </class>
+</mapping>
diff --git a/src/main/resources/mapFiles/index b/src/main/resources/mapFiles/index index 25fef77..4e378e4 100644 --- a/src/main/resources/mapFiles/index +++ b/src/main/resources/mapFiles/index @@ -9,3 +9,4 @@ ViewpointMap.xml TransferMap.xml
NewEntityMap.xml
ModuleMap.xml
+StateMachineMap.xml
|