From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 3 Aug 2012 22:58:16 +0000 (-0700)
Subject: CSPACE-4774: Removed obsolete, legacy loanInContact field from the Loan In record... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b59a9e4aa723ff9456bbea5759c38e872214ebef;p=tmp%2Fjakarta-migration.git

CSPACE-4774: Removed obsolete, legacy loanInContact field from the Loan In record in the services layer. Since v2.0, this field has been effectively replaced by the borrowersContact field.
---

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index d38dc67e4..311e46cba 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -861,10 +861,6 @@
                             <types:key>authRef</types:key>
                             <types:value>borrowersContact</types:value>
                         </types:item>
-                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
-                            <types:key>authRef</types:key>
-                            <types:value>loanInContact</types:value>
-                        </types:item>
                         <!-- Fields containing term list / controlled vocabulary references -->
                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
                             <types:key>termRef</types:key>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml
index e7cabb079..a237e924c 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -31,7 +31,6 @@ $LastChangedDate: $
                 <row><widget>lendersAuthorizer</widget></row>
                 <row><widget>lendersAuthorizationDate</widget></row>
                 <row><widget>lendersContact</widget></row>
-                <row><widget>loanInContact</widget></row>
                 <row><widget>loanInConditions</widget></row>
                 <row><widget>loanInDate</widget></row>
                 <row><widget>loanReturnDate</widget></row>
@@ -106,19 +105,6 @@ $LastChangedDate: $
                 </properties>
             </widget>
 
-            <widget name="loanInContact" type="text">
-                <labels>
-                    <label mode="any">loanInContact</label>
-                </labels>
-                <translated>true</translated>
-                <fields>
-                    <field schema="loansin_common">loanInContact</field>
-                </fields>
-                <properties widgetMode="edit">
-                    <property name="styleClass">dataInputText</property>
-                </properties>
-            </widget>
-
             <widget name="loanInConditions" type="text">
                 <labels>
                     <label mode="any">loanInConditions</label>
diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
index 6503d151b..cbbecf1ac 100644
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
@@ -23,7 +23,6 @@
     <!--  Loan In Information Group -->
     <xs:element name="loanInNumber" type="xs:string"/>
     <xs:element name="lenderGroupList" type="lenderGroupList"/>
-    <xs:element name="loanInContact" type="xs:string"/>
     <xs:element name="borrowersContact" type="xs:string"/>
     <xs:element name="borrowersAuthorizer" type="xs:string"/>
     <xs:element name="borrowersAuthorizationDate" type="xs:date"/>
diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
index d83dc751e..e79023f93 100644
--- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
+++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
@@ -78,7 +78,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
     private String lenderRefName = null;
     private String lendersAuthorizerRefName = null;
     private String lendersContactRefName = null;
-    private String loanInContactRefName = null;
+    private String borrowersContactRefName = null;
     private String borrowersAuthorizerRefName = null;
     private final int NUM_AUTH_REFS_EXPECTED = 5;
     private final static String CURRENT_DATE_UTC =
@@ -126,7 +126,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
 		lenderRefName,
                 lendersAuthorizerRefName,
                 lendersContactRefName,
-                loanInContactRefName,
+                borrowersContactRefName,
                 borrowersAuthorizerRefName);
         ClientResponse<Response> response = loaninClient.create(multipart);
         int statusCode = response.getStatus();
@@ -192,9 +192,9 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
         personIdsCreated.add(csid);
         lendersContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
         
-        csid = createPerson("Carrie", "Loanincontact", "carrieLoanincontact", authRefName);
+        csid = createPerson("Carrie", "Borrowerscontact", "carrieBorrowerscontact", authRefName);
         personIdsCreated.add(csid);
-        loanInContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        borrowersContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
 
         csid = createPerson("Bonnie", "Borrowersauthorizer", "bonnieBorrowersauthorizer", authRefName);
         personIdsCreated.add(csid);
@@ -260,7 +260,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
         // Assert.assertEquals(loaninCommon.getLendersAuthorizer(), lendersAuthorizerRefName);
         // Assert.assertEquals(loaninCommon.getLendersContact(), lendersContactRefName);
         //
-        Assert.assertEquals(loaninCommon.getLoanInContact(), loanInContactRefName);
+        Assert.assertEquals(loaninCommon.getBorrowersContact(), borrowersContactRefName);
         Assert.assertEquals(loaninCommon.getBorrowersAuthorizer(), borrowersAuthorizerRefName);
         
         // Get the auth refs and check them
@@ -373,7 +373,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
     		String lender,
     		String lendersAuthorizer,
     		String lendersContact,
-    		String loaninContact,
+    		String borrowersContact,
     		String borrowersAuthorizer) {
     	LoansinCommon loaninCommon = new LoansinCommon();
     	loaninCommon.setLoanInNumber(loaninNumber);
@@ -385,7 +385,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
     	lenderGroup.setLendersContact(lendersContact);
     	lenderGroupList.getLenderGroup().add(lenderGroup);
     	loaninCommon.setLenderGroupList(lenderGroupList);
-    	loaninCommon.setLoanInContact(loaninContact);
+    	loaninCommon.setBorrowersContact(borrowersContact);
     	loaninCommon.setBorrowersAuthorizer(borrowersAuthorizer);
 
     	PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent());
diff --git a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java
index cc1d031b0..ea7e5e085 100644
--- a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java
+++ b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninJAXBSchema.java
@@ -10,7 +10,6 @@ public interface LoaninJAXBSchema {
     final static String LENDERS_AUTHORIZER = "lendersAuthorizer";
     final static String LENDERS_AUTHORIZATION_DATE = "lendersAuthorizationDate";
     final static String LENDERS_CONTACT = "lendersContact";
-    final static String LOAN_IN_CONTACT = "loanInContact";
     final static String LOAN_IN_CONDITIONS = "loanInConditions";
     final static String LOAN_IN_DATE = "loanInDate";
     final static String LOAN_RETURN_DATE = "loanReturnDate";
diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
index f330feae4..65c9e6df8 100644
--- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd
+++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
@@ -33,7 +33,6 @@
             <xs:sequence> 
                 <xs:element name="loanInNumber" type="xs:string"/>
                 <xs:element name="lenderGroupList" type="lenderGroupList"/>
-                <xs:element name="loanInContact" type="xs:string"/>
                 <xs:element name="borrowersContact" type="xs:string"/>
                 <xs:element name="borrowersAuthorizer" type="xs:string"/>
                 <xs:element name="borrowersAuthorizationDate" type="xs:string"/>