diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-07-02 14:16:20 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-07-02 14:16:20 +0200 |
| commit | cc79e98c4763affba4fa2e17dfe5a412f9de66c3 (patch) | |
| tree | cc9bbf21bed983bec0a9320dc9a3504e3821dbdd /src/main/resources/boot | |
| parent | 11eb9557a35e17450c0aefb758471f1ff3148336 (diff) | |
Removed persistency of VertexOutlineCreator - containing subclasses
should set this.
Fixed persistency of GTimeStamp
Fixed CompActOutcome not showing when loaded
Diffstat (limited to 'src/main/resources/boot')
| -rw-r--r-- | src/main/resources/boot/CA/ManageCompositeActDef.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/boot/CA/ManageElementaryActDef.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/boot/CA/ManageSchema.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/boot/CA/ManageScript.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/boot/CA/NoWorkflow.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/boot/CA/ServerItemWorkflow.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/CompositeActivityDef.xsd | 2 |
7 files changed, 7 insertions, 17 deletions
diff --git a/src/main/resources/boot/CA/ManageCompositeActDef.xml b/src/main/resources/boot/CA/ManageCompositeActDef.xml index 15a60b5..9eb8bf0 100644 --- a/src/main/resources/boot/CA/ManageCompositeActDef.xml +++ b/src/main/resources/boot/CA/ManageCompositeActDef.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="ManageCompositeActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+ <GraphModelCastorData StartVertexId="13" NextId="26">
<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
<CentrePoint x="358" y="360"/>
<OutlinePoint x="328" y="348"/>
@@ -214,6 +214,4 @@ <KeyValuePair Key="ScriptVersion" String=""/>
<KeyValuePair Key="Skippable" Boolean="false"/>
</Properties>
- <castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
- <castorNonLayoutableChildren>EditActivityDef</castorNonLayoutableChildren>
</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml index 90ffaf8..03f747a 100644 --- a/src/main/resources/boot/CA/ManageElementaryActDef.xml +++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="ManageElementaryActDef" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="26">
+ <GraphModelCastorData StartVertexId="13" NextId="26">
<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
<CentrePoint x="358" y="360"/>
<OutlinePoint x="328" y="348"/>
@@ -214,6 +214,4 @@ <KeyValuePair Key="ScriptVersion" String=""/>
<KeyValuePair Key="Skippable" Boolean="false"/>
</Properties>
- <castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
- <castorNonLayoutableChildren>EditActivityDef</castorNonLayoutableChildren>
</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageSchema.xml b/src/main/resources/boot/CA/ManageSchema.xml index d25ce70..69580fe 100644 --- a/src/main/resources/boot/CA/ManageSchema.xml +++ b/src/main/resources/boot/CA/ManageSchema.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="ManageSchema" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="13" NextId="22">
+ <GraphModelCastorData StartVertexId="13" NextId="22">
<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
<CentrePoint x="358" y="360"/>
<OutlinePoint x="328" y="348"/>
@@ -213,6 +213,4 @@ <KeyValuePair Key="ScriptVersion" String=""/>
<KeyValuePair Key="Skippable" Boolean="false"/>
</Properties>
- <castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
- <castorNonLayoutableChildren>EditSchema</castorNonLayoutableChildren>
</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/ManageScript.xml b/src/main/resources/boot/CA/ManageScript.xml index c629c8e..9dff06f 100644 --- a/src/main/resources/boot/CA/ManageScript.xml +++ b/src/main/resources/boot/CA/ManageScript.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="ManageScript" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="11" NextId="27">
+ <GraphModelCastorData StartVertexId="11" NextId="27">
<LoopDef ID="15" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false" isNext="0">
<CentrePoint x="425" y="291"/>
<OutlinePoint x="395" y="279"/>
@@ -214,6 +214,4 @@ <KeyValuePair Key="Skippable" Boolean="false"/>
<KeyValuePair Key="ScriptVersion" String=""/>
</Properties>
- <castorNonLayoutableChildren>EditScriptDefinition</castorNonLayoutableChildren>
- <castorNonLayoutableChildren>AssignNewVersionFromLast</castorNonLayoutableChildren>
</CompositeActivityDef>
diff --git a/src/main/resources/boot/CA/NoWorkflow.xml b/src/main/resources/boot/CA/NoWorkflow.xml index e49b1cc..e0746f4 100644 --- a/src/main/resources/boot/CA/NoWorkflow.xml +++ b/src/main/resources/boot/CA/NoWorkflow.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="NoWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="-1" NextId="0"/>
+ <GraphModelCastorData StartVertexId="-1" NextId="0"/>
</childrenGraphModel>
<Properties>
<KeyValuePair Key="Autostart" Boolean="true"/>
diff --git a/src/main/resources/boot/CA/ServerItemWorkflow.xml b/src/main/resources/boot/CA/ServerItemWorkflow.xml index 7d8531d..085f8ab 100644 --- a/src/main/resources/boot/CA/ServerItemWorkflow.xml +++ b/src/main/resources/boot/CA/ServerItemWorkflow.xml @@ -1,6 +1,6 @@ <CompositeActivityDef ID="-1" Name="ServerItemWorkflow" Height="0" Width="0" IsLayoutable="false" IsComposite="true">
<childrenGraphModel>
- <GraphModelCastorData ClassNameOfVertexOutlineCreator="com.c2kernel.lifecycle.WfVertexDefOutlineCreator" StartVertexId="4" NextId="21">
+ <GraphModelCastorData StartVertexId="4" NextId="21">
<JoinDef ID="9" Name="" Height="24" Width="60" IsLayoutable="true" IsComposite="false">
<CentrePoint x="244" y="378"/>
<OutlinePoint x="214" y="366"/>
@@ -212,6 +212,4 @@ <KeyValuePair Key="ScriptVersion" String=""/>
<KeyValuePair Key="Skippable" Boolean="false"/>
</Properties>
- <castorNonLayoutableChildren>CreateNewAgent</castorNonLayoutableChildren>
- <castorNonLayoutableChildren>CreateNewItem</castorNonLayoutableChildren>
</CompositeActivityDef>
diff --git a/src/main/resources/boot/OD/CompositeActivityDef.xsd b/src/main/resources/boot/OD/CompositeActivityDef.xsd index b6dc373..acdcae4 100644 --- a/src/main/resources/boot/OD/CompositeActivityDef.xsd +++ b/src/main/resources/boot/OD/CompositeActivityDef.xsd @@ -142,7 +142,7 @@ </xs:complexType>
</xs:element>
</xs:choice>
- <xs:attribute name="ClassNameOfVertexOutlineCreator" type="xs:string" use="required"/>
+ <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:complexType>
|