diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-07-12 14:52:36 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-07-12 14:52:36 +0200 |
| commit | 20c81748688547c1b13686f15c65fbb1d60d81a0 (patch) | |
| tree | 59dc2b94c47ed30b8bc93c07cab42e96904d1146 /src/main/resources | |
| parent | 61559eef9369dbdbb027bec7c571d7f770b2e7a3 (diff) | |
Suspend transition now can carry an optional 'Errors' outcome where
client processes can record the reason for the suspension. Errors XML is
marshalled ErrorInfo. UserCodeProcess automatically sends fatal
ErrorInfos through suspend jobs.
Job API added to to support all this.
fixes #23
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/boot/OD/Errors.xsd | 12 | ||||
| -rw-r--r-- | src/main/resources/boot/allbootitems.txt | 1 | ||||
| -rw-r--r-- | src/main/resources/mapFiles/LifeCycleMap.xml | 9 |
3 files changed, 22 insertions, 0 deletions
diff --git a/src/main/resources/boot/OD/Errors.xsd b/src/main/resources/boot/OD/Errors.xsd new file mode 100644 index 0000000..a30473c --- /dev/null +++ b/src/main/resources/boot/OD/Errors.xsd @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" attributeFormDefault="unqualified"> + <xs:element name="Errors"> + <xs:complexType> + <xs:sequence> + <xs:element name="Message" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="fatal" type="xs:boolean"/> + </xs:complexType> + </xs:element> +</xs:schema>
\ No newline at end of file diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt index 810d5ee..8c6e052 100644 --- a/src/main/resources/boot/allbootitems.txt +++ b/src/main/resources/boot/allbootitems.txt @@ -7,6 +7,7 @@ OD/PredefinedStepOutcome OD/PropertyDescription
OD/Schema
OD/Script
+OD/Errors
EA/AssignNewVersionFromLast
EA/EditActivityDef
EA/EditSchema
diff --git a/src/main/resources/mapFiles/LifeCycleMap.xml b/src/main/resources/mapFiles/LifeCycleMap.xml index ba75864..f623e52 100644 --- a/src/main/resources/mapFiles/LifeCycleMap.xml +++ b/src/main/resources/mapFiles/LifeCycleMap.xml @@ -97,4 +97,13 @@ <class name="com.c2kernel.lifecycle.instance.predefined.ServerPredefinedStepContainer" extends="com.c2kernel.lifecycle.instance.predefined.PredefinedStepContainer">
<map-to xml="ServerPredefinedStepContainer"/>
</class>
+ <class name="com.c2kernel.scripting.ErrorInfo">
+ <map-to xml="Errors"/>
+ <field name="fatal" type="boolean" direct="false">
+ <bind-xml name="fatal" node="attribute"/>
+ </field>
+ <field name="msg" type="string" direct="false" collection="arraylist" get-method="getErrors" set-method="setErrors">
+ <bind-xml name="Message" node="element"/>
+ </field>
+ </class>
</mapping>
|