diff options
Diffstat (limited to 'src/main/resources')
| -rw-r--r-- | src/main/resources/boot/CA/ManageElementaryActDef.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/boot/EA/CreateNewAgent.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/boot/EA/CreateNewItem.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/Agent.xsd (renamed from src/main/resources/boot/OD/NewAgent.xsd) | 2 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/Item.xsd | 105 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/Module.xsd | 55 | ||||
| -rw-r--r-- | src/main/resources/boot/OD/NewItem.xsd | 73 | ||||
| -rw-r--r-- | src/main/resources/boot/allbootitems.txt | 4 | ||||
| -rw-r--r-- | src/main/resources/mapFiles/ModuleMap.xml | 116 | ||||
| -rw-r--r-- | src/main/resources/mapFiles/NewEntityMap.xml | 51 | ||||
| -rw-r--r-- | src/main/resources/mapFiles/PropertiesMap.xml | 4 | ||||
| -rw-r--r-- | src/main/resources/mapFiles/index | 1 |
12 files changed, 272 insertions, 145 deletions
diff --git a/src/main/resources/boot/CA/ManageElementaryActDef.xml b/src/main/resources/boot/CA/ManageElementaryActDef.xml index 03f747a..77baa8e 100644 --- a/src/main/resources/boot/CA/ManageElementaryActDef.xml +++ b/src/main/resources/boot/CA/ManageElementaryActDef.xml @@ -94,7 +94,7 @@ <KeyValuePair Key="Prefill" Boolean="false"/>
<KeyValuePair Key="Prefill Version" String="-1"/>
<KeyValuePair Key="ViewName" String="ElementaryActivityDef"/>
- <KeyValuePair Key="Name" String="AssignNewSchemaVersionFromLast"/>
+ <KeyValuePair Key="Name" String="AssignNewActivityVersionFromLast"/>
</Properties>
<activityDef>AssignNewVersionFromLast</activityDef>
</ActivitySlotDef>
diff --git a/src/main/resources/boot/EA/CreateNewAgent.xml b/src/main/resources/boot/EA/CreateNewAgent.xml index 49f1f32..1377012 100644 --- a/src/main/resources/boot/EA/CreateNewAgent.xml +++ b/src/main/resources/boot/EA/CreateNewAgent.xml @@ -10,7 +10,7 @@ <KeyValuePair Key="Show time" Boolean="true"/>
<KeyValuePair Key="Viewpoint" String=""/>
<KeyValuePair Key="Agent Role" String="Admin"/>
- <KeyValuePair Key="SchemaType" String="NewAgent"/>
+ <KeyValuePair Key="SchemaType" String="Agent"/>
<KeyValuePair Key="ScriptName" String="ServerNewEntity"/>
<KeyValuePair Key="Ignorable" Boolean="false"/>
<KeyValuePair Key="ScriptVersion" String="0"/>
diff --git a/src/main/resources/boot/EA/CreateNewItem.xml b/src/main/resources/boot/EA/CreateNewItem.xml index 8daaf74..d3dee53 100644 --- a/src/main/resources/boot/EA/CreateNewItem.xml +++ b/src/main/resources/boot/EA/CreateNewItem.xml @@ -10,7 +10,7 @@ <KeyValuePair Key="Show time" Boolean="true"/>
<KeyValuePair Key="Viewpoint" String=""/>
<KeyValuePair Key="Agent Role" String="Admin"/>
- <KeyValuePair Key="SchemaType" String="NewItem"/>
+ <KeyValuePair Key="SchemaType" String="Item"/>
<KeyValuePair Key="ScriptName" String="ServerNewEntity"/>
<KeyValuePair Key="Ignorable" Boolean="false"/>
<KeyValuePair Key="ScriptVersion" String="0"/>
diff --git a/src/main/resources/boot/OD/NewAgent.xsd b/src/main/resources/boot/OD/Agent.xsd index 773f4fc..5b9f3f4 100644 --- a/src/main/resources/boot/OD/NewAgent.xsd +++ b/src/main/resources/boot/OD/Agent.xsd @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>
<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Andrew Branson (CERN) -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="NewAgent">
+ <xs:element name="Agent">
<xs:annotation>
<xs:documentation>Complete Structure for new agent</xs:documentation>
</xs:annotation>
diff --git a/src/main/resources/boot/OD/Item.xsd b/src/main/resources/boot/OD/Item.xsd new file mode 100644 index 0000000..5d5c1cf --- /dev/null +++ b/src/main/resources/boot/OD/Item.xsd @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="Item">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Properties" type="properties" />
+ <xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="schema" type="xs:string" use="required" />
+ <xs:attribute name="version" type="xs:string" use="required" />
+ <xs:attribute name="viewname" type="xs:string" use="required" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Dependency" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CollectionProperties" type="collprops" />
+ <xs:element name="DependencyMember" minOccurs="0"
+ maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="MemberProperties" type="collprops" />
+ </xs:sequence>
+ <xs:attribute name="itemPath" type="xs:string"
+ use="required" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="isDescription" type="xs:boolean"
+ use="optional" default="false" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Aggregation" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>A new collection with layout
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AggregationMember" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Geometry" minOccurs="1"
+ maxOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="x" type="xs:int" use="required" />
+ <xs:attribute name="y" type="xs:int" use="required" />
+ <xs:attribute name="width" type="xs:int" use="required" />
+ <xs:attribute name="height" type="xs:int" use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="MemberProperties" type="collprops" />
+ </xs:sequence>
+ <xs:attribute name="slotNo" type="xs:int" use="required" />
+ <xs:attribute name="itemDescriptionPath" type="xs:string"
+ use="optional" />
+ <xs:attribute name="itemPath" type="xs:string"
+ use="optional" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="isDescription" type="xs:boolean"
+ use="required" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:attribute name="workflow" type="xs:string" use="optional" />
+ <xs:attribute name="initialPath" type="xs:string" use="optional" />
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="properties">
+ <xs:sequence>
+ <xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="collprops">
+ <xs:sequence>
+ <xs:element name="KeyValuePair" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="Key" type="xs:string" use="optional" />
+ <xs:attribute name="Boolean" type="xs:boolean" use="optional" />
+ <xs:attribute name="String" type="xs:string" use="optional" />
+ <xs:attribute name="Integer" type="xs:int" use="optional" />
+ <xs:attribute name="Float" type="xs:double" use="optional" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
diff --git a/src/main/resources/boot/OD/Module.xsd b/src/main/resources/boot/OD/Module.xsd index 10a0155..bd92ffc 100644 --- a/src/main/resources/boot/OD/Module.xsd +++ b/src/main/resources/boot/OD/Module.xsd @@ -47,7 +47,8 @@ <xs:element name="Imports" minOccurs="0">
<xs:annotation>
<xs:documentation>Items to import into or verify within the
- Cristal server upon launch.</xs:documentation>
+ Cristal server upon launch.
+ </xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
@@ -73,17 +74,7 @@ <xs:element name="Item" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="Property" minOccurs="0"
- maxOccurs="unbounded">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"
- use="required" />
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
+ <xs:element name="Property" type="property" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="Outcome" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
@@ -102,12 +93,23 @@ maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="DependencyMember" type="xs:string"
- minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="DependencyMember" minOccurs="0"
+ maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="MemberProperties" type="collprops" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="itemPath" type="xs:string"
+ use="required" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="CollectionProperties" type="collprops" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="isDescription" type="xs:boolean"
use="optional" default="false" />
+ <xs:attribute name="itemDescriptionPath"
+ type="xs:string" use="optional" />
</xs:complexType>
</xs:element>
<xs:element name="Aggregation" minOccurs="0"
@@ -121,7 +123,8 @@ <xs:element name="AggregationMember" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="Geometry">
+ <xs:element name="Geometry" minOccurs="1"
+ maxOccurs="1">
<xs:complexType>
<xs:attribute name="x" type="xs:int" use="required" />
<xs:attribute name="y" type="xs:int" use="required" />
@@ -131,6 +134,7 @@ use="required" />
</xs:complexType>
</xs:element>
+ <xs:element name="MemberProperties" type="collprops" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="slotNo" type="xs:int"
use="required" />
@@ -158,6 +162,7 @@ <xs:complexType>
<xs:sequence>
<xs:element name="Role" type="xs:string" maxOccurs="unbounded" />
+ <xs:element name="Property" type="property" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="password" type="xs:string"
@@ -194,4 +199,24 @@ </xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:complexType name="property">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ <xs:complexType name="collprops">
+ <xs:sequence>
+ <xs:element name="KeyValuePair" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="Key" type="xs:string" use="optional" />
+ <xs:attribute name="Boolean" type="xs:boolean" use="optional" />
+ <xs:attribute name="String" type="xs:string" use="optional" />
+ <xs:attribute name="Integer" type="xs:int" use="optional" />
+ <xs:attribute name="Float" type="xs:double" use="optional" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/src/main/resources/boot/OD/NewItem.xsd b/src/main/resources/boot/OD/NewItem.xsd deleted file mode 100644 index bcd5298..0000000 --- a/src/main/resources/boot/OD/NewItem.xsd +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Andrew Branson (CERN) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="NewItem">
- <xs:annotation>
- <xs:documentation>Complete Structure for new item</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Property" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>New Properties for the item</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="value" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Aggregation" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>A new collection with layout</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AggregationMember" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Geometry">
- <xs:annotation>
- <xs:documentation>The position and size of this member slot on the layout</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:attribute name="x" type="xs:int" use="required"/>
- <xs:attribute name="y" type="xs:int" use="required"/>
- <xs:attribute name="width" type="xs:int" use="required"/>
- <xs:attribute name="height" type="xs:int" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="slotNo" type="xs:int" use="required"/>
- <xs:attribute name="itemDescriptionPath" type="xs:string" use="optional"/>
- <xs:attribute name="itemPath" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="isDescription" type="xs:boolean" use="required"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="Dependency" minOccurs="0" maxOccurs="unbounded">
- <xs:annotation>
- <xs:documentation>A new collection without layout</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:sequence>
- <xs:element name="DependencyMember" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="itemPath" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="isDescription" type="xs:boolean" use="required"/>
- <xs:attribute name="itemDescriptionPath" type="xs:string" use="optional"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string" use="required"/>
- <xs:attribute name="initialPath" type="xs:string" use="required"/>
- <xs:attribute name="workflow" type="xs:string" use="required"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/src/main/resources/boot/allbootitems.txt b/src/main/resources/boot/allbootitems.txt index 5eddc7a..09a98b8 100644 --- a/src/main/resources/boot/allbootitems.txt +++ b/src/main/resources/boot/allbootitems.txt @@ -1,8 +1,8 @@ OD/CompositeActivityDef
OD/ElementaryActivityDef
OD/Module
-OD/NewAgent
-OD/NewItem
+OD/Agent
+OD/Item
OD/PredefinedStepOutcome
OD/PropertyDescription
OD/Schema
diff --git a/src/main/resources/mapFiles/ModuleMap.xml b/src/main/resources/mapFiles/ModuleMap.xml index 15fcb99..d858123 100644 --- a/src/main/resources/mapFiles/ModuleMap.xml +++ b/src/main/resources/mapFiles/ModuleMap.xml @@ -1,41 +1,85 @@ <?xml version="1.0"?>
<mapping>
<class name="com.c2kernel.process.module.Module">
- <map-to xml="CristalModule"/>
- <field name="ns" direct="true" type="string">
- <bind-xml name="ns" node="attribute"/>
- </field>
- <field name="name" direct="true" type="string">
- <bind-xml name="name" node="attribute"/>
- </field>
- <field name="desc" direct="true" type="string">
- <bind-xml name="Description" node="element"/>
- </field>
- <field name="version" direct="true" type="string">
- <bind-xml name="Version" node="element"/>
- </field>
- <field name="dependency" collection="arraylist" direct="true" type="string">
- <bind-xml name="Dependency" node="element"/>
- </field>
- <field name="resURL" direct="true" type="string">
- <bind-xml name="ResourceURL" node="element"/>
- </field>
- <field name="dependency" collection="arraylist" direct="true" type="string">
- <bind-xml name="Dependency" node="element"/>
- </field>
- <field name="imports" collection="arraylist" direct="true"
- type="com.c2kernel.process.module.ModuleImport">
- <bind-xml auto-naming="deriveByClass" node="element"/>
- <field name="importName" direct="true" type="string">
- <bind-xml name="name" node="attribute"/>
- </field>
- </field>
- </class>
- <class name="com.c2kernel.process.module.ModuleItem"
- extends="com.c2kernel.process.module.ModuleImport">
- <map-to xml="Item"/>
- <field name="workflow" direct="true" type="string">
- <bind-xml name="workflow" node="attribute"/>
- </field>
+ <map-to xml="CristalModule" />
+ <field name="ns" direct="true" type="string">
+ <bind-xml name="ns" node="attribute" />
+ </field>
+ <field name="name" direct="true" type="string">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="info" direct="true" type="com.c2kernel.process.module.ModuleInfo">
+ <bind-xml name="Info" node="element" />
+ </field>
+ <field name="resURL" direct="true" type="string">
+ <bind-xml name="ResourceURL" node="element" />
+ </field>
+ <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">
+ <bind-xml name="Config" node="element" />
+ </field>
+ <field name="scripts" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleScript">
+ <bind-xml name="Script" node="element" />
+ </field>
</class>
+ <class name="com.c2kernel.process.module.ModuleImports">
+ <map-to xml="Imports"/>
+ <field name="list" collection="arraylist" direct="true" type="com.c2kernel.process.module.ModuleImport">
+ <bind-xml auto-naming="deriveByClass" node="element" />
+ </field>
+ </class>
+ <class name="com.c2kernel.process.module.ModuleInfo">
+ <map-to xml="Info"/>
+ <field name="desc" direct="true" type="string">
+ <bind-xml name="Description" node="element" />
+ </field>
+ <field name="version" direct="true" type="string">
+ <bind-xml name="Version" node="element" />
+ </field>
+ <field name="dependency" collection="arraylist" direct="true"
+ type="string">
+ <bind-xml name="Dependency" node="element" />
+ </field>
+ </class>
+ <class name="com.c2kernel.process.module.ModuleResource" extends="com.c2kernel.process.module.ModuleImport">
+ <map-to xml="Resource"/>
+ <field name="name" direct="true" type="string">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="resourceType" direct="true" type="string">
+ <bind-xml name="type" node="attribute" />
+ </field>
+ <field name="resourceLocation" direct="true" type="string">
+ <bind-xml node="text" />
+ </field>
+ </class>
+ <class name="com.c2kernel.process.module.ModuleConfig">
+ <map-to xml="Config"/>
+ <field name="name" direct="true" type="string">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="target" direct="true" type="string">
+ <bind-xml name="target" node="attribute" />
+ </field>
+ <field name="value" direct="true" type="string">
+ <bind-xml node="text" />
+ </field>
+ </class>
+ <class name="com.c2kernel.process.module.ModuleScript">
+ <map-to xml="Script"/>
+ <field name="target" direct="true" type="string">
+ <bind-xml name="target" node="attribute" />
+ </field>
+ <field name="event" direct="true" type="string">
+ <bind-xml name="event" node="attribute" />
+ </field>
+ <field name="lang" direct="true" type="string">
+ <bind-xml name="lang" node="attribute" />
+ </field>
+ <field name="script" direct="true" type="string">
+ <bind-xml node="text" />
+ </field>
+ </class>
</mapping>
diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml index 5d9d7ca..a5d5006 100644 --- a/src/main/resources/mapFiles/NewEntityMap.xml +++ b/src/main/resources/mapFiles/NewEntityMap.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?>
<mapping>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewItem">
- <map-to xml="NewItem"/>
+ <map-to xml="Item"/>
<field name="name" type="string" direct="true">
<bind-xml name="name" node="attribute"/>
</field>
@@ -11,22 +11,17 @@ <field name="workflow" type="string" direct="true">
<bind-xml name="workflow" node="attribute"/>
</field>
- <field name="propertyList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Property">
+ <field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">
<bind-xml name="Property" node="element"/>
</field>
- <field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
- <bind-xml name="Aggregation" node="element"/>
+ <field name="outcomes" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Outcome">
+ <bind-xml name="Outcome" node="element"/>
</field>
<field name="dependencyList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency">
<bind-xml name="Dependency" node="element"/>
</field>
- </class>
- <class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Property">
- <field name="name" type="string" direct="true">
- <bind-xml name="name" node="attribute"/>
- </field>
- <field name="value" type="string" direct="true">
- <bind-xml name="value" node="attribute"/>
+ <field name="aggregationList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
+ <bind-xml name="Aggregation" node="element"/>
</field>
</class>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Aggregation">
@@ -53,6 +48,10 @@ <field name="geometry" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">
<bind-xml name="Geometry" node="element"/>
</field>
+ <field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+ get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+ <bind-xml name="MemberProperties" node="element"/>
+ </field>
</class>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.Geometry">
<field name="x" type="int" direct="true">
@@ -81,14 +80,37 @@ <field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">
<bind-xml name="DependencyMember" node="element"/>
</field>
+ <field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+ get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+ <bind-xml name="CollectionProperties" node="element"/>
+ </field>
</class>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember">
<field name="itemPath" type="string" direct="true">
<bind-xml name="itemPath" node="attribute"/>
</field>
+ <field name="props" type="com.c2kernel.utils.KeyValuePair" collection="array" container="false" direct="false"
+ get-method="getKeyValuePairs" set-method="setKeyValuePairs">
+ <bind-xml name="MemberProperties" node="element"/>
+ </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>
+ <field name="schema" type="string" direct="true">
+ <bind-xml name="schema" node="attribute"/>
+ </field>
+ <field name="version" type="integer" direct="true">
+ <bind-xml name="version" node="attribute"/>
+ </field>
+ <field name="path" type="string" direct="true">
+ <bind-xml name="viewname" node="text"/>
+ </field>
+ </class>
<class name="com.c2kernel.lifecycle.instance.predefined.entitycreation.NewAgent">
- <map-to xml="NewAgent"/>
+ <map-to xml="Agent"/>
<field name="name" type="string" direct="true">
<bind-xml name="name" node="attribute"/>
</field>
@@ -98,5 +120,8 @@ <field name="roles" collection="arraylist" direct="true" type="string">
<bind-xml name="Role" node="element"/>
</field>
- </class>
+ <field name="properties" collection="arraylist" direct="true" type="com.c2kernel.property.Property">
+ <bind-xml name="Property" node="element"/>
+ </field>
+ </class>
</mapping>
diff --git a/src/main/resources/mapFiles/PropertiesMap.xml b/src/main/resources/mapFiles/PropertiesMap.xml index 7936a75..cdb27fc 100644 --- a/src/main/resources/mapFiles/PropertiesMap.xml +++ b/src/main/resources/mapFiles/PropertiesMap.xml @@ -3,10 +3,10 @@ <class name="com.c2kernel.property.Property">
<map-to xml="Property"/>
<field name="mName" type="string" direct="false" get-method="getName" set-method="setName">
- <bind-xml name="Name" node="attribute"/>
+ <bind-xml name="name" node="attribute"/>
</field>
<field name="mValue" type="string" direct="false" get-method="getValue" set-method="setValue">
- <bind-xml name="Value" node="element"/>
+ <bind-xml node="text"/>
</field>
</class>
diff --git a/src/main/resources/mapFiles/index b/src/main/resources/mapFiles/index index 03de6f2..25fef77 100644 --- a/src/main/resources/mapFiles/index +++ b/src/main/resources/mapFiles/index @@ -8,3 +8,4 @@ JobListMap.xml ViewpointMap.xml
TransferMap.xml
NewEntityMap.xml
+ModuleMap.xml
|
