From f27e8c7b42825f927fd1d0fa23dd94f659410622 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 20 Aug 2013 17:30:48 -0700
Subject: [PATCH] CSPACE-6152: Simplify persons_naturalhistory schema, now
 consisting of a single field, but continue to demonstrate extension of an
 authority item schema.

---
 .../xmlreplay/person/lifesciperson.xml        |  3 --
 .../person/persons_common_and_lifesci.xml     |  1 -
 ...persons_common_and_lifesci_set_broader.xml |  1 -
 .../lifesci/lifesci-tenant-bindings.delta.xml | 27 -----------------
 .../tenants/lifesci/tenant-bindings.delta.xml | 29 -------------------
 5 files changed, 61 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml
index d12309887..6f5136f65 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/lifesciperson.xml
@@ -28,7 +28,6 @@
         <var ID="foreName">John</var>
         <var ID="surName">Wayne</var>
         <var ID="entityType">Actor</var>
-        <var ID="lifeSpan">Way Long Time</var>
       </vars>
     </test>
     <test ID="Person2">
@@ -40,7 +39,6 @@
         <var ID="foreName">Billy-Bob</var>
         <var ID="surName">Homeboy</var>
         <var ID="entityType">Goof</var>
-        <var ID="lifeSpan">Too Long</var>
       </vars>
     </test>
     <test ID="getAuthorityList">
@@ -73,7 +71,6 @@
         <var ID="foreName">Billy-Bob</var>
         <var ID="surName">Homeboy</var>
         <var ID="entityType">Goof</var>
-        <var ID="lifeSpan">Too Long</var>
         <var ID="childCSID">${Person2.CSID}</var>
         <var ID="parentCSID">${Person1.CSID}</var>
         <var ID="parentName">John Wayne</var>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
index 0f2742f29..b42456ec2 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
@@ -16,7 +16,6 @@
 	</ns2:persons_common>
 	<ns4:persons_naturalhistory xmlns:ns4="http://collectionspace.org/services/person/domain/naturalhistory" xmlns:ns3="http://collectionspace.org/services/jaxb">
 		<entityType>${entityType}</entityType>
-		<lifeSpan>${lifeSpan}</lifeSpan>
 	</ns4:persons_naturalhistory>
 </document>
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
index 5a5f91a4b..ac1d1838f 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
@@ -16,7 +16,6 @@
 	</pers:persons_common>
 	<pnh:persons_naturalhistory xmlns:pnh="http://collectionspace.org/services/person/domain/naturalhistory">
 		<entityType>${entityType}</entityType>
-		<lifeSpan>${lifeSpan}</lifeSpan>
 	</pnh:persons_naturalhistory>
 	<relns:relations-common-list xmlns:relns="http://collectionspace.org/services/relation">
     <relation-list-item>
diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml
index c06c3ed6f..b3dcb1f84 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/lifesci-tenant-bindings.delta.xml
@@ -19,33 +19,6 @@
 					<service:content contentType="application/xml">
 						<service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory" schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd"/>
 					</service:content>
-					<service:properties>
-						<!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>authRef</types:key>
-							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>authRef</types:key>
-							<types:value>orgContactNames|orgContactName</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>nameTypes|nameType</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>nameSource</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>entityType</types:value>
-						</types:item>
-					</service:properties>
 				</service:part>
 			</service:object>
 		</tenant:serviceBindings>
diff --git a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
index 5b9a926f4..911bc20a4 100644
--- a/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
@@ -82,35 +82,6 @@
 						<service:xmlContent namespaceURI="http://collectionspace.org/services/person/domain/naturalhistory"
 							schemaLocation="http://collectionspace.org/services/person/domain/naturalhistory http://collectionspace.org/services/person/domain/persons_naturalhistory.xsd" />
 					</service:content>
-					<service:properties>
-						<!-- See CSPACE-3938 for potential additional authRef and termRef entries -->
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>authRef</types:key>
-							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrg
-							</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>authRef</types:key>
-							<types:value>orgContactNames|orgContactName</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>affiliatedPersonOrgGroupList/*/affiliatedPersonOrgType
-							</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>nameTypes|nameType</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>nameSource</types:value>
-						</types:item>
-						<types:item xmlns:types="http://collectionspace.org/services/config/types">
-							<types:key>termRef</types:key>
-							<types:value>entityType</types:value>
-						</types:item>
-					</service:properties>
 				</service:part>
 			</service:object>
 		</tenant:serviceBindings>
-- 
2.47.3