CSPACE-2138: Removed 'honorifics' field from the Person schema in the services layer...

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 1134df6e106233d0feb774e30e64f7cc8a539ef0..62124045bbd6bcda33d8f2f3ad83b89873f653f7 100644 (file)
--- 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 cc48cc207b680394d627e8203ee25c7b9ee6e413..4cfad2e5cf45805d63393cc4e7720d5d42313031 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
@@ -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 26bc92fa22b079e192ca31014ba8effe96ad7aa5..e52c7dafc5a5c43bd9dfcba32c6f0994b6600f10 100644 (file)
--- 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";\r
        final static String SALUTATIONS = "salutations";\r
        final static String TITLE = "title";\r
-        final static String HONORIFICS = "honorifics";\r
        final static String NAME_ADDITIONS = "nameAdditions";\r
        final static String BIRTH_DATE = "birthDate";\r
        final static String DEATH_DATE = "deathDate";\r

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index bb15d83ed120a56474655987d9fc09792dd4a50d..fc08f81d5e8b2fd123f5fd1b0eb2b516609205dd 100644 (file)
--- 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"/>