CSPACE-5128: Added 'Group' to the end of birthDate and deathDate to keep naming consi...

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 a5678030bf793efd447fffbdaf3147b64570c16c..c13460b34ec1f26eec2c1d9d4b5a5b5fa96c7666 100644 (file)
--- 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 75745ebf7e37c5a4c9ebeff331d06d9f626efc10..7e15847660da41f84cb6cd25de5590fb3cd56321 100644 (file)
--- 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) {\r
             StructuredDateGroup birthDate = new StructuredDateGroup();\r
             birthDate.setDateDisplayDate(value);\r
-            person.setBirthDate(birthDate);\r
+            person.setBirthDateGroup(birthDate);\r
         }\r
         if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) {\r
             StructuredDateGroup deathDate = new StructuredDateGroup();\r
             deathDate.setDateDisplayDate(value);\r
-            person.setDeathDate(deathDate);\r
+            person.setDeathDateGroup(deathDate);\r
         }\r
         if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null)\r
                person.setBirthPlace(value);\r

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index c09112e52dbd75ffc381c6952b15244eb4d2aadc..33b8582a6593ed9fa60c4b06c51b7c79a5f71cc7 100644 (file)
--- 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 105d374313f236fad4d5329b0ba29607249c2ca7..1e09bc184655dbfdcc17b2fc5b926d12b8353a3c 100644 (file)
--- 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) {\r
                 StructuredDateGroup birthDate = new StructuredDateGroup();\r
                 birthDate.setDateDisplayDate(value);\r
-                person.setBirthDate(birthDate);\r
+                person.setBirthDateGroup(birthDate);\r
             }\r
             if((value = (String)personInfo.get(PersonJAXBSchema.DEATH_DATE))!=null) {\r
                 StructuredDateGroup deathDate = new StructuredDateGroup();\r
                 deathDate.setDateDisplayDate(value);\r
-                person.setDeathDate(deathDate);\r
+                person.setDeathDateGroup(deathDate);\r
             }\r
             if((value = (String)personInfo.get(PersonJAXBSchema.BIRTH_PLACE))!=null)\r
                person.setBirthPlace(value);\r