From e288643636e37b81af93cf35355ef3f1e19c3dcf Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 17 Jun 2010 04:08:37 +0000
Subject: [PATCH] CSPACE-2138: Removed 'honorifics' field from the Person
 schema in the services layer.  This field is equivalent to and redundant - at
 least according to the wiki schema and its multiple-source crosswalks - with
 the 'nameAdditions' field.

---
 .../main/resources/OSGI-INF/layouts-contrib.xml    | 14 --------------
 .../src/main/resources/schemas/persons_common.xsd  |  1 -
 .../collectionspace/services/PersonJAXBSchema.java |  1 -
 .../jaxb/src/main/resources/person_common.xsd      | 14 ++++++++++++--
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
index 1134df6e1..62124045b 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -73,7 +73,6 @@
         <row><widget>initials</widget></row>
         <row><widget>salutation</widget></row>
         <row><widget>title</widget></row>
-        <row><widget>honorifics</widget></row>
         <row><widget>nameAdditions</widget></row>
         <row><widget>birthDate</widget></row>
         <row><widget>deathDate</widget></row>
@@ -205,19 +204,6 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-
-      <widget name="honorifics" type="text">
-        <labels>
-          <label mode="any">honorifics</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="persons_common">honorifics</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
       
       <widget name="nameAdditions" type="text">
         <labels>
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 cc48cc207..4cfad2e5c 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
@@ -32,7 +32,6 @@
     <xs:element name="initials" type="xs:string"/>
     <xs:element name="salutation" type="xs:string"/>
     <xs:element name="title" type="xs:string"/>
-    <xs:element name="honorifics" type="xs:string"/>
     <xs:element name="nameAdditions" type="xs:string"/>
     <xs:element name="birthDate" type="xs:string"/>
     <xs:element name="deathDate" type="xs:string"/>
diff --git a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
index 26bc92fa2..e52c7dafc 100644
--- a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
+++ b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
@@ -20,7 +20,6 @@ public interface PersonJAXBSchema {
 	final static String INITIALS = "initials";
 	final static String SALUTATIONS = "salutations";
 	final static String TITLE = "title";
-        final static String HONORIFICS = "honorifics";
 	final static String NAME_ADDITIONS = "nameAdditions";
 	final static String BIRTH_DATE = "birthDate";
 	final static String DEATH_DATE = "deathDate";
diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index bb15d83ed..fc08f81d5 100644
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -1,4 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    Person schema (XSD)
+
+    Entity  : Person
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+
+    $LastChangedRevision: $
+    $LastChangedDate: $
+-->
+
 <xs:schema 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -9,7 +21,6 @@
     version="0.1"
     >
     
-    
     <!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Person+Service+Home -->    
     
@@ -31,7 +42,6 @@
                 <xs:element name="initials" type="xs:string"/>
                 <xs:element name="salutation" type="xs:string"/>
                 <xs:element name="title" type="xs:string"/>
-                <xs:element name="honorifics" type="xs:string"/>
                 <xs:element name="nameAdditions" type="xs:string"/>
                 <xs:element name="birthDate" type="xs:string"/>
                 <xs:element name="deathDate" type="xs:string"/>
-- 
2.47.3