From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 2 Jun 2010 23:03:51 +0000 (+0000)
Subject: CSPACE-1875: In Loan Out records in the Services Layer, merged into trunk from the... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=530814fef6597b0600e2d55b0a3dfa548a21e724;p=tmp%2Fjakarta-migration.git

CSPACE-1875: In Loan Out records in the Services Layer, merged into trunk from the 0.7 Release Branch, three scalar fields were added: loanedObjectStatus, loanedObjectStatusNote, and loanedObjectStatusDate. This is an interim step until sub-loans are implemented in a later release.
---

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 7b58dfc79..b518cbb7e 100644
--- 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"/>
     <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"/>
diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
index b6abdf6a5..3a5f5f139 100644
--- 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"/>