From 9c5d6e82b5ce733cf23e4317e3bafaa42c2221ba Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 1 Oct 2014 21:09:06 +0200
Subject: Collection version support, stored as a new final component of the
 Collection path. Null version implies "last".

---
 src/main/resources/boot/OD/Item.xsd          |  4 ++++
 src/main/resources/boot/OD/Module.xsd        |  6 ++++++
 src/main/resources/mapFiles/NewEntityMap.xml | 12 ++++++++++++
 3 files changed, 22 insertions(+)

(limited to 'src/main/resources')

diff --git a/src/main/resources/boot/OD/Item.xsd b/src/main/resources/boot/OD/Item.xsd
index 2169161..b3d64e6 100644
--- a/src/main/resources/boot/OD/Item.xsd
+++ b/src/main/resources/boot/OD/Item.xsd
@@ -39,6 +39,8 @@
 							use="optional" default="false" />
 						<xs:attribute name="itemDescriptionPath" type="xs:string"
 							use="optional" />
+						<xs:attribute name="itemDescriptionVersion" type="xs:string"
+							use="optional" />							
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="Aggregation" minOccurs="0" maxOccurs="unbounded">
@@ -69,6 +71,8 @@
 									<xs:attribute name="slotNo" type="xs:int" use="required" />
 									<xs:attribute name="itemDescriptionPath" type="xs:string"
 										use="optional" />
+									<xs:attribute name="itemDescriptionVersion" type="xs:string"
+										use="optional" />										
 									<xs:attribute name="itemPath" type="xs:string"
 										use="optional" />
 								</xs:complexType>
diff --git a/src/main/resources/boot/OD/Module.xsd b/src/main/resources/boot/OD/Module.xsd
index 9fb93b2..54d89e2 100644
--- a/src/main/resources/boot/OD/Module.xsd
+++ b/src/main/resources/boot/OD/Module.xsd
@@ -100,10 +100,13 @@
 														minOccurs="0" />
 												</xs:sequence>
 												<xs:attribute name="name" type="xs:string" use="required" />
+												<xs:attribute name="version" type="xs:integer" use="optional" />
 												<xs:attribute name="isDescription" type="xs:boolean"
 													use="optional" default="false" />
 												<xs:attribute name="itemDescriptionPath" type="xs:string"
 													use="optional" />
+												<xs:attribute name="itemDescriptionVersion" type="xs:string"
+													use="optional" />
 											</xs:complexType>
 										</xs:element>
 										<xs:element name="Aggregation" minOccurs="0"
@@ -138,12 +141,15 @@
 																use="required" />
 															<xs:attribute name="itemDescriptionPath"
 																type="xs:string" use="optional" />
+															<xs:attribute name="itemDescriptionVersion" 
+																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="version" type="xs:integer" use="optional" />
 												<xs:attribute name="isDescription" type="xs:boolean"
 													use="required" />
 											</xs:complexType>
diff --git a/src/main/resources/mapFiles/NewEntityMap.xml b/src/main/resources/mapFiles/NewEntityMap.xml
index 58de4d1..0c91b64 100644
--- a/src/main/resources/mapFiles/NewEntityMap.xml
+++ b/src/main/resources/mapFiles/NewEntityMap.xml
@@ -34,6 +34,9 @@
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
+		<field name="version" type="integer" direct="true">
+			<bind-xml name="version" node="attribute"/>
+		</field>
 		<field name="isDescription" type="boolean" direct="true">
 			<bind-xml name="isDescription" node="attribute"/>
 		</field>
@@ -48,6 +51,9 @@
 		<field name="itemDescriptionPath" type="string" direct="true">
 			<bind-xml name="itemDescriptionPath" node="attribute"/>
 		</field>
+		<field name="itemDescriptionVersion" type="string" direct="true">
+			<bind-xml name="itemDescriptionVersion" node="attribute"/>
+		</field>		
 		<field name="itemPath" type="string" direct="true">
 			<bind-xml name="itemPath" node="attribute"/>
 		</field>
@@ -77,12 +83,18 @@
 		<field name="name" type="string" direct="true">
 			<bind-xml name="name" node="attribute"/>
 		</field>
+		<field name="version" type="integer" direct="true">
+			<bind-xml name="version" node="attribute"/>
+		</field>		
 		<field name="isDescription" type="boolean" direct="true">
 			<bind-xml name="isDescription" node="attribute"/>
 		</field>
 		<field name="itemDescriptionPath" type="string" direct="true">
 			<bind-xml name="itemDescriptionPath" node="attribute"/>
 		</field>
+		<field name="itemDescriptionVersion" type="string" direct="true">
+			<bind-xml name="itemDescriptionVersion" node="attribute"/>
+		</field>		
 		<field name="dependencyMemberList" collection="arraylist" direct="true" type="com.c2kernel.entity.imports.ImportDependencyMember">
 			<bind-xml name="DependencyMember" node="element"/>
 		</field>
-- 
cgit v1.2.3