CSPACE-1875: In Loan Out records in the Services Layer, merged into trunk from the...

diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
index 7b58dfc796693f89ee6e653f6d00181356c228a1..b518cbb7e29e56dd7fa9131979be9b692323cb56 100644 (file)
--- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
+++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd
@@ -28,14 +28,11 @@
     <xs:element name="lendersAuthorizationDate" type="xs:string"/>\r
     <xs:element name="lendersContact" type="xs:string"/>\r
     \r
-    <!--\r
-         Omitting loaned object status fields in release 0.5.2,\r
-         as these are likely to be repeatable or else handled\r
-         in some alternate way in release 0.7.\r
-    -->\r
-    <!-- xs:element name="loanedObjectStatus" type="xs:string"/ -->\r
-    <!-- xs:element name="loanedObjectStatusDate" type="xs:string"/ -->\r
-    <!-- xs:element name="loanedObjectStatusNote" type="xs:string"/ -->\r
+    <!-- The three fields below were added as scalars specifically for release 0.7. -->\r
+    <!-- These fields will be removed, to be replaced by sub-loans, in a future release. -->\r
+    <xs:element name="loanedObjectStatus" type="xs:string"/>\r
+    <xs:element name="loanedObjectStatusDate" type="xs:string"/>\r
+    <xs:element name="loanedObjectStatusNote" type="xs:string"/>\r
     \r
     <xs:element name="loanOutDate" type="xs:string"/>\r
     <xs:element name="loanReturnDate" type="xs:string"/>\r

diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
index b6abdf6a549bcaaa053629bb3fbad870668a22ed..3a5f5f139d01a4beb193069492b1b8adcb61bcb6 100644 (file)
--- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd
+++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
@@ -39,14 +39,11 @@
                 <xs:element name="lendersAuthorizationDate" type="xs:string"/>
                 <xs:element name="lendersContact" type="xs:string"/>
                 
-                <!--
-                     Omitting loaned object status fields in release 0.5.2,
-                     as these are likely to be repeatable or else handled
-                     in some alternate way in release 0.7.
-                -->
-                <!-- xs:element name="loanedObjectStatus" type="xs:string"/ -->
-                <!-- xs:element name="loanedObjectStatusDate" type="xs:string"/ -->
-                <!-- xs:element name="loanedObjectStatusNote" type="xs:string"/ -->
+                <!-- The three fields below were added as scalars specifically for release 0.7. -->
+                <!-- These fields will be removed, to be replaced by sub-loans, in a future release. -->
+                <xs:element name="loanedObjectStatus" type="xs:string"/>
+                <xs:element name="loanedObjectStatusDate" type="xs:string"/>
+                <xs:element name="loanedObjectStatusNote" type="xs:string"/>
                 
                 <xs:element name="loanOutDate" type="xs:string"/>
                 <xs:element name="loanReturnDate" type="xs:string"/>