CSPACE-1009: Conformed Acqusitions schema in services layer to 'Limited for 0.5'...

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
index 511186e16fced0774d6188deec437f0416a38c1e..368a55b20733261faedc5b6dd2b750cd8686d862 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -14,7 +14,7 @@
         <row><widget>acquisitionAuthorizer</widget></row>
         <row><widget>AcquisitionAuthorizerDate</widget></row>
         <row><widget>AcquisitionDate</widget></row>
-        <row><widget>AcquisitionFunding</widget></row>
+        <row><widget>AcquisitionFundingDenomination</widget></row>
         <row><widget>AcquisitionFundingSource</widget></row>
         <row><widget>AcquisitionFundingSourceProvisos</widget></row>
         <row><widget>AcquisitionMethod</widget></row>
@@ -23,13 +23,21 @@
         <row><widget>AcquisitionReason</widget></row>
         <row><widget>AcquisitionReferenceNumber</widget></row>
         <row><widget>AcquisitionSource</widget></row>
-        <row><widget>GroupPurchasePrice</widget></row>
-        <row><widget>ObjectOfferPrice</widget></row>
-        <row><widget>ObjectPurchaseOfferPrice</widget></row>
-        <row><widget>ObjectPurchasePrice</widget></row>
-        <row><widget>OriginalObjectPurchasePrice</widget></row>
+        <row><widget>GroupPurchasePriceDenomination</widget></row>
+        <row><widget>GroupPurchasePriceValue</widget></row>
+        <row><widget>ObjectOfferPriceDenomination</widget></row>
+        <row><widget>ObjectOfferPriceValue</widget></row>
+        <row><widget>ObjectPurchaseOfferPriceDenomination</widget></row>
+        <row><widget>ObjectPurchaseOfferPriceValue</widget></row>
+        <row><widget>ObjectPurchasePriceDenomination</widget></row>
+        <row><widget>ObjectPurchasePriceValue</widget></row>
         <row><widget>OriginalObjectPurchasePriceDenomination</widget></row>
+        <row><widget>OriginalObjectPurchasePriceValue</widget></row>
         <row><widget>TransferOfTitleNumber</widget></row>
+        <row><widget>fieldCollectionData</widget></row>
+        <row><widget>fieldCollectionEventName</widget></row>
+        <row><widget>fieldCollectionNumber</widget></row>
+        <row><widget>fieldCollector</widget></row>
       </rows>
 
       <widget name="accessionDate" type="text">
@@ -64,7 +72,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:AcquisitionAuthorizerDate</field>
+          <field>acq:acquisitionAuthorizerDate</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -77,7 +85,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:AcquisitionDate</field>
+          <field>acq:acquisitionDate</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -90,20 +98,46 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:AcquisitionFunding</field>
+          <field>acq:acquisitionFunding</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
+
+      <widget name="AcquisitionFundingDenomination" type="text">
+        <labels>
+          <label mode="any">AcquisitionFundingDenomination</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:acquisitionFundingDenomination</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="AcquisitionFundingDenomination" type="text">
+        <labels>
+          <label mode="any">AcquisitionFundingValue</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:acquisitionFundingValue</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
       <widget name="AcquisitionFundingSource" type="text">
         <labels>
           <label mode="any">AcquisitionFundingSource</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:AcquisitionFundingSource</field>
+          <field>acq:acquisitionFundingSource</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -201,71 +235,110 @@
         </properties>
       </widget>
       
-      <widget name="GroupPurchasePrice" type="text">
+      <widget name="GroupPurchasePriceDenomination" type="text">
         <labels>
-          <label mode="any">GroupPurchasePrice</label>
+          <label mode="any">GroupPurchasePriceDenomination</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:GroupPurchasePrice</field>
+          <field>acq:groupPurchasePriceDenomination</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="ObjectOfferPrice" type="text">
+
+      <widget name="GroupPurchasePriceValue" type="text">
         <labels>
-          <label mode="any">ObjectOfferPrice</label>
+          <label mode="any">GroupPurchasePriceValue</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:ObjectOfferPrice</field>
+          <field>acq:groupPurchasePriceValue</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="ObjectPurchaseOfferPrice" type="text">
+
+      <widget name="ObjectOfferPriceDenomination" type="text">
         <labels>
-          <label mode="any">ObjectPurchaseOfferPrice</label>
+          <label mode="any">ObjectOfferPriceDenomination</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:ObjectPurchaseOfferPrice</field>
+          <field>acq:objectOfferPriceDenomination</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="ObjectPurchasePrice" type="text">
+
+     <widget name="ObjectOfferPriceValue" type="text">
         <labels>
-          <label mode="any">ObjectPurchasePrice</label>
+          <label mode="any">objectOfferPriceValue</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:ObjectPurchasePrice</field>
+          <field>acq:objectOfferPriceValue</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
       
-      <widget name="OriginalObjectPurchasePrice" type="text">
+      <widget name="ObjectPurchaseOfferPriceDenomination" type="text">
         <labels>
-          <label mode="any">OriginalObjectPurchasePrice</label>
+          <label mode="any">ObjectPurchaseOfferPriceDenomination</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:OriginalObjectPurchasePrice</field>
+          <field>acq:objectPurchaseOfferPriceDenomination</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
+
+       <widget name="ObjectPurchaseOfferPriceValue" type="text">
+        <labels>
+          <label mode="any">ObjectPurchaseOfferPriceValue</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:objectPurchaseOfferPriceValue</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="ObjectPurchasePriceDenomination" type="text">
+        <labels>
+          <label mode="any">ObjectPurchasePriceDenomination</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:objectPurchasePriceDenomination</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+       <widget name="ObjectPurchasePriceValue" type="text">
+        <labels>
+          <label mode="any">ObjectPurchasePriceValue</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:objectPurchasePriceValue</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
       <widget name="OriginalObjectPurchasePriceDenomination" type="text">
         <labels>
           <label mode="any">OriginalObjectPurchasePriceDenomination</label>
@@ -278,20 +351,85 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
+
+      <widget name="OriginalObjectPurchasePriceValue" type="text">
+        <labels>
+          <label mode="any">OriginalObjectPurchasePriceValue</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:originalObjectPurchasePriceValue</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
       <widget name="TransferOfTitleNumber" type="text">
         <labels>
           <label mode="any">TransferOfTitleNumber</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field>acq:TransferOfTitleNumber</field>
+          <field>acq:transferOfTitleNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
+
+      <widget name="fieldCollectionData" type="text">
+        <labels>
+          <label mode="any">fieldCollectionData</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:fieldCollectionData</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="fieldCollectionEventName" type="text">
+        <labels>
+          <label mode="any">fieldCollectionEventName</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:fieldCollectionEventName</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="fieldCollectionNumber" type="text">
+        <labels>
+          <label mode="any">fieldCollectionNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:fieldCollectionNumber</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
+      <widget name="fieldCollector" type="text">
+        <labels>
+          <label mode="any">fieldCollector</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:fieldCollector</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+
     </layout>
   </extension>
 </component>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index acdf4351c4f6cf7daa50c26530243172effd11f9..70921c00f2144678ec1cba2a52652e8c0080f40f 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -25,7 +25,8 @@
     <xs:element name="acquisitionAuthorizer" type="xs:string"/>\r
     <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>\r
     <xs:element name="acquisitionDate" type="xs:string"/>\r
-    <xs:element name="acquisitionFunding" type="xs:string"/>\r
+    <xs:element name="acquisitionFundingDenomination" type="xs:string"/>\r
+    <xs:element name="acquisitionFundingValue" type="xs:string"/>\r
     <xs:element name="acquisitionFundingSource" type="xs:string"/>\r
     <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>\r
     <xs:element name="acquisitionMethod" type="xs:string"/>\r
@@ -41,12 +42,20 @@
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r
-    <xs:element name="groupPurchasePrice" type="xs:string"/>\r
-    <xs:element name="objectOfferPrice" type="xs:string"/>\r
-    <xs:element name="objectPurchaseOfferPrice" type="xs:string"/>\r
-    <xs:element name="objectPurchasePrice" type="xs:string"/>\r
-    <xs:element name="originalObjectPurchasePrice" type="xs:string"/>\r
+    <xs:element name="groupPurchasePriceDenomination" type="xs:string"/>\r
+    <xs:element name="groupPurchasePriceValue" type="xs:string"/>\r
+    <xs:element name="objectOfferPriceDenomination" type="xs:string"/>\r
+    <xs:element name="objectOfferPriceValue" type="xs:string"/>\r
+    <xs:element name="objectPurchaseOfferPriceDenomination" type="xs:string"/>\r
+    <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>\r
+    <xs:element name="objectPurchasePriceDenomination" type="xs:string"/>\r
+    <xs:element name="objectPurchasePriceValue" type="xs:string"/>\r
     <xs:element name="originalObjectPurchasePriceDenomination" type="xs:string"/>\r
+    <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>\r
     <xs:element name="transferOfTitleNumber" type="xs:string"/>\r
-    \r
+    <!-- Object Collection Information Group -->\r
+    <xs:element name="fieldCollectionData" type="xs:string"/>\r
+    <xs:element name="fieldCollectionEventName" type="xs:string"/>\r
+    <xs:element name="fieldCollectionNumber" type="xs:string"/>\r
+    <xs:element name="fieldCollector" type="xs:string"/>\r
 </xs:schema>\r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index b6a88a79d5c8640d8f0b0720bc5a8edbfc9bc47d..d0e6480ae859b295742e5a54b2c0345cebd04f6d 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -36,7 +36,8 @@
                 <xs:element name="acquisitionAuthorizer" type="xs:string"/>
                 <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>
                 <xs:element name="acquisitionDate" type="xs:string"/>
-                <xs:element name="acquisitionFunding" type="xs:string"/>
+                <xs:element name="acquisitionFundingDenomination" type="xs:string"/>
+                <xs:element name="acquisitionFundingValue" type="xs:string"/>
                 <xs:element name="acquisitionFundingSource" type="xs:string"/>
                 <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>
                 <xs:element name="acquisitionMethod" type="xs:string"/>
@@ -45,18 +46,27 @@
                 <xs:element name="acquisitionReason" type="xs:string"/>
                 <xs:element name="acquisitionReferenceNumber" type="xs:string"/>
                 <xs:element name="acquisitionSources" type="acquisitionSourceList"/>
-                <xs:element name="groupPurchasePrice" type="xs:string"/>
-                <xs:element name="objectOfferPrice" type="xs:string"/>
-                <xs:element name="objectPurchaseOfferPrice" type="xs:string"/>
-                <xs:element name="objectPurchasePrice" type="xs:string"/>
-                <xs:element name="originalObjectPurchasePrice" type="xs:string"/>
+                <xs:element name="groupPurchasePriceDenomination" type="xs:string"/>
+                <xs:element name="groupPurchasePriceValue" type="xs:string"/>
+                <xs:element name="objectOfferPriceDenomination" type="xs:string"/>
+                <xs:element name="objectOfferPriceValue" type="xs:string"/>
+                <xs:element name="objectPurchaseOfferPriceDenomination" type="xs:string"/>
+                <xs:element name="objectPurchaseOfferPriceValue" type="xs:string"/>
+                <xs:element name="objectPurchasePriceDenomination" type="xs:string"/>
+                <xs:element name="objectPurchasePriceValue" type="xs:string"/>
                 <xs:element name="originalObjectPurchasePriceDenomination" type="xs:string"/>
+                <xs:element name="originalObjectPurchasePriceValue" type="xs:string"/>
                 <xs:element name="transferOfTitleNumber" type="xs:string"/>
+                <!-- Object Collection Information Group -->
+                <xs:element name="fieldCollectionData" type="xs:string"/>
+                <xs:element name="fieldCollectionEventName" type="xs:string"/>
+                <xs:element name="fieldCollectionNumber" type="xs:string"/>
+                <xs:element name="fieldCollector" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
 
-   <xs:complexType name="acquisitionSourceList">
+    <xs:complexType name="acquisitionSourceList">
         <xs:sequence>
             <xs:element name="acquisitionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>