From 584eaff80d93d0f8189e29795edd883c62b1cdca Mon Sep 17 00:00:00 2001
From: Amy Wieliczka <amywieliczka@berkeley.edu>
Date: Tue, 15 May 2012 15:59:25 -0700
Subject: [PATCH] CSPACE-5128: Added 'Group' to the end of birthDate and
 deathDate to keep naming consistent

---
 .../src/main/resources/schemas/persons_common.xsd             | 4 ++--
 .../services/client/PersonAuthorityClientUtils.java           | 4 ++--
 services/person/jaxb/src/main/resources/person_common.xsd     | 4 ++--
 .../collectionspace/services/person/client/sample/Sample.java | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
index a5678030b..c13460b34 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
@@ -30,8 +30,8 @@
     <xs:element name="personTermGroupList" type="personTermGroupList"/>
     
     <xs:element name="description" type="xs:string"/>
-    <xs:element name="birthDate" type="structuredDateGroup"/>
-    <xs:element name="deathDate" type="structuredDateGroup"/>
+    <xs:element name="birthDateGroup" type="structuredDateGroup"/>
+    <xs:element name="deathDateGroup" type="structuredDateGroup"/>
     <xs:element name="birthPlace" type="xs:string"/>
     <xs:element name="deathPlace" type="xs:string"/>
     <xs:element name="groups">
diff --git a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
index 75745ebf7..7e1584766 100644
--- a/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
+++ b/services/person/client/src/main/java/org/collectionspace/services/client/PersonAuthorityClientUtils.java
@@ -207,12 +207,12 @@ public class PersonAuthorityClientUtils {
         if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) {
             StructuredDateGroup birthDate = new StructuredDateGroup();
             birthDate.setDateDisplayDate(value);
-            person.setBirthDate(birthDate);
+            person.setBirthDateGroup(birthDate);
         }
         if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) {
             StructuredDateGroup deathDate = new StructuredDateGroup();
             deathDate.setDateDisplayDate(value);
-            person.setDeathDate(deathDate);
+            person.setDeathDateGroup(deathDate);
         }
         if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null)
         	person.setBirthPlace(value);
diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index c09112e52..33b8582a6 100644
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -40,8 +40,8 @@
                 <xs:element name="personTermGroupList" type="personTermGroupList"/>
 
                 <xs:element name="description" type="xs:string"/>
-                <xs:element name="birthDate" type="structuredDateGroup"/>
-                <xs:element name="deathDate" type="structuredDateGroup"/>
+                <xs:element name="birthDateGroup" type="structuredDateGroup"/>
+                <xs:element name="deathDateGroup" type="structuredDateGroup"/>
                 <xs:element name="birthPlace" type="xs:string"/>
                 <xs:element name="deathPlace" type="xs:string"/>
                 <xs:element name="groups" type="groupList"/>
diff --git a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
index 105d37431..1e09bc184 100644
--- a/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
+++ b/services/person/sample/sample/src/main/java/org/collectionspace/services/person/client/sample/Sample.java
@@ -375,12 +375,12 @@ public class Sample {
             if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_DATE))!=null) {
                 StructuredDateGroup birthDate = new StructuredDateGroup();
                 birthDate.setDateDisplayDate(value);
-                person.setBirthDate(birthDate);
+                person.setBirthDateGroup(birthDate);
             }
             if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) {
                 StructuredDateGroup deathDate = new StructuredDateGroup();
                 deathDate.setDateDisplayDate(value);
-                person.setDeathDate(deathDate);
+                person.setDeathDateGroup(deathDate);
             }
             if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null)
             	person.setBirthPlace(value);
-- 
2.47.3